diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2015-02-26 13:54:17 -0800 |
|---|---|---|
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-12-08 11:27:09 -0800 |
| commit | 15a725e446472c31c834baa1129ef5fb4c9f2933 (patch) | |
| tree | 00a09bd0b69ea393f14e206825618ef1170e90f3 | |
| parent | 2bd0a2a8c54cbe37b9a8490584e8438b9abb7b2e (diff) | |
| download | edison-v3.10-15a725e446472c31c834baa1129ef5fb4c9f2933.tar.gz | |
selinux: remove unnecessary pointer reassignment
(cherry pick from commit 83d4a806ae46397f606de7376b831524bd3a21e5)
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>
Bug: 22846070
Change-Id: I4aef4b95820e813c370525310e37f5da22d25efc
| -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 c223a32c0bb..21e48baf0bb 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -729,12 +729,10 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, rcu_read_lock(); node = avc_lookup(ssid, tsid, tclass); - if (unlikely(!node)) { + if (unlikely(!node)) node = avc_compute_av(ssid, tsid, tclass, avd); - } else { + else memcpy(avd, &node->ae.avd, sizeof(*avd)); - avd = &node->ae.avd; - } denied = requested & ~(avd->allowed); if (unlikely(denied)) |