diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
| commit | 94851b18d4eb94f8bbf0d9176f7429bd8e371f62 (patch) | |
| tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /security/selinux/avc.c | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| download | talos-obmc-linux-94851b18d4eb94f8bbf0d9176f7429bd8e371f62.tar.gz talos-obmc-linux-94851b18d4eb94f8bbf0d9176f7429bd8e371f62.zip | |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'security/selinux/avc.c')
| -rw-r--r-- | security/selinux/avc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index dad36a6ab45f..fc3e6628a864 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -746,7 +746,6 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, * @tclass: target security class * @requested: requested permissions, interpreted based on @tclass * @auditdata: auxiliary audit data - * @flags: VFS walk flags * * Check the AVC to determine whether the @requested permissions are granted * for the SID pair (@ssid, @tsid), interpreting the permissions @@ -756,17 +755,15 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, * permissions are granted, -%EACCES if any permissions are denied, or * another -errno upon other errors. */ -int avc_has_perm_flags(u32 ssid, u32 tsid, u16 tclass, - u32 requested, struct common_audit_data *auditdata, - unsigned flags) +int avc_has_perm(u32 ssid, u32 tsid, u16 tclass, + u32 requested, struct common_audit_data *auditdata) { struct av_decision avd; int rc, rc2; rc = avc_has_perm_noaudit(ssid, tsid, tclass, requested, 0, &avd); - rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata, - flags); + rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata); if (rc2) return rc2; return rc; |
