Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88447
b: refs/heads/master
c: eda4f69
h: refs/heads/master
i:
  88445: 07dd421
  88443: 1d20dee
  88439: 8565cb5
  88431: e0c75f5
  88415: 81dc615
  88383: 7b7ae7c
  88319: 58c8bd0
v: v3
  • Loading branch information
Eric Paris authored and James Morris committed Apr 18, 2008
1 parent a148072 commit f355d6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0115e6c8980ea9125a17858291c90ecd990bc1c
refs/heads/master: eda4f69ca5a532b425db5a6c2c6bc50717b9b5fe
4 changes: 3 additions & 1 deletion trunk/security/selinux/avc.c
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,8 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid,
int rc = 0;
u32 denied;

BUG_ON(!requested);

rcu_read_lock();

node = avc_lookup(ssid, tsid, tclass, requested);
Expand All @@ -890,7 +892,7 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid,

denied = requested & ~(p_ae->avd.allowed);

if (!requested || denied) {
if (denied) {
if (selinux_enforcing || (flags & AVC_STRICT))
rc = -EACCES;
else
Expand Down

0 comments on commit f355d6b

Please sign in to comment.