diff options
| author | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /security/selinux/avc.c | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/avc.c')
| -rw-r--r-- | security/selinux/avc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 7f9b5fac8779..b2ab60859832 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -927,7 +927,7 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid, | |||
| 927 | if (denied) { | 927 | if (denied) { |
| 928 | if (flags & AVC_STRICT) | 928 | if (flags & AVC_STRICT) |
| 929 | rc = -EACCES; | 929 | rc = -EACCES; |
| 930 | else if (!selinux_enforcing || security_permissive_sid(ssid)) | 930 | else if (!selinux_enforcing || (avd->flags & AVD_FLAGS_PERMISSIVE)) |
| 931 | avc_update_node(AVC_CALLBACK_GRANT, requested, ssid, | 931 | avc_update_node(AVC_CALLBACK_GRANT, requested, ssid, |
| 932 | tsid, tclass, avd->seqno); | 932 | tsid, tclass, avd->seqno); |
| 933 | else | 933 | else |