diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2015-02-26 16:54:17 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2015-04-06 20:04:54 -0400 |
commit | 83d4a806ae46397f606de7376b831524bd3a21e5 (patch) | |
tree | 952b111e4f79483efc35ffa4ebeaec412f001ebf /security | |
parent | 4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57 (diff) |
selinux: remove unnecessary pointer reassignment
Commit f01e1af445fa ("selinux: don't pass in NULL avd to avc_has_perm_noaudit")
made this pointer reassignment unnecessary. Avd should continue to reference
the stack-based copy.
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/avc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index afcc0aed9393..3c17dda9571d 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
@@ -724,12 +724,10 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, | |||
724 | rcu_read_lock(); | 724 | rcu_read_lock(); |
725 | 725 | ||
726 | node = avc_lookup(ssid, tsid, tclass); | 726 | node = avc_lookup(ssid, tsid, tclass); |
727 | if (unlikely(!node)) { | 727 | if (unlikely(!node)) |
728 | node = avc_compute_av(ssid, tsid, tclass, avd); | 728 | node = avc_compute_av(ssid, tsid, tclass, avd); |
729 | } else { | 729 | else |
730 | memcpy(avd, &node->ae.avd, sizeof(*avd)); | 730 | memcpy(avd, &node->ae.avd, sizeof(*avd)); |
731 | avd = &node->ae.avd; | ||
732 | } | ||
733 | 731 | ||
734 | denied = requested & ~(avd->allowed); | 732 | denied = requested & ~(avd->allowed); |
735 | if (unlikely(denied)) | 733 | if (unlikely(denied)) |