projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
096fe9e
)
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
author
James Morris
<james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000
(15:04 +1100)
committer
James Morris
<james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000
(15:04 +1100)
security/selinux/ss/conditional.c
patch
|
blob
|
history
diff --git
a/security/selinux/ss/conditional.c
b/security/selinux/ss/conditional.c
index 18643bf9894d5e393bdb51b0d7b0740f34960e75..456e1a9bcfde14e594789de0b1055c63f8dd549e 100644
(file)
--- a/
security/selinux/ss/conditional.c
+++ b/
security/selinux/ss/conditional.c
@@
-638,7
+638,7
@@
void cond_compute_av(struct avtab *ctab, struct avtab_key *key,
{
struct avtab_node *node;
- if (!ctab || !key || !avd
|| !xperms
)
+ if (!ctab || !key || !avd)
return;
for (node = avtab_search_node(ctab, key); node;
@@
-657,7
+657,7
@@
void cond_compute_av(struct avtab *ctab, struct avtab_key *key,
if ((u16)(AVTAB_AUDITALLOW|AVTAB_ENABLED) ==
(node->key.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED)))
avd->auditallow |= node->datum.u.data;
- if ((node->key.specified & AVTAB_ENABLED) &&
+ if (
xperms &&
(node->key.specified & AVTAB_ENABLED) &&
(node->key.specified & AVTAB_XPERMS))
services_compute_xperms_drivers(xperms, node);
}