projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
[firefly-linux-kernel-4.4.55.git]
/
security
/
selinux
/
avc.c
diff --git
a/security/selinux/avc.c
b/security/selinux/avc.c
index afcc0aed9393a6d1917b6167bf68403729dccea8..3c17dda9571d4e97f7f460e162a6195bf215758b 100644
(file)
--- a/
security/selinux/avc.c
+++ b/
security/selinux/avc.c
@@
-724,12
+724,10
@@
inline int avc_has_perm_noaudit(u32 ssid, u32 tsid,
rcu_read_lock();
node = avc_lookup(ssid, tsid, tclass);
rcu_read_lock();
node = avc_lookup(ssid, tsid, tclass);
- if (unlikely(!node))
{
+ if (unlikely(!node))
node = avc_compute_av(ssid, tsid, tclass, avd);
node = avc_compute_av(ssid, tsid, tclass, avd);
- } else {
+ else
memcpy(avd, &node->ae.avd, sizeof(*avd));
memcpy(avd, &node->ae.avd, sizeof(*avd));
- avd = &node->ae.avd;
- }
denied = requested & ~(avd->allowed);
if (unlikely(denied))
denied = requested & ~(avd->allowed);
if (unlikely(denied))