Skip to content

Commit

Permalink
selinux: remove 'flags' parameter from avc_audit()
Browse files Browse the repository at this point in the history
Now avc_audit() has no more users with that parameter. Remove it.

Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
torvalds committed Oct 4, 2013
1 parent cb4fbe5 commit ab35406
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion security/selinux/avc.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ int avc_has_perm(u32 ssid, u32 tsid, u16 tclass,

rc = avc_has_perm_noaudit(ssid, tsid, tclass, requested, 0, &avd);

rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata, 0);
rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata);
if (rc2)
return rc2;
return rc;
Expand Down
2 changes: 1 addition & 1 deletion security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@ static int cred_has_capability(const struct cred *cred,

rc = avc_has_perm_noaudit(sid, sid, sclass, av, 0, &avd);
if (audit == SECURITY_CAP_AUDIT) {
int rc2 = avc_audit(sid, sid, sclass, av, &avd, rc, &ad, 0);
int rc2 = avc_audit(sid, sid, sclass, av, &avd, rc, &ad);
if (rc2)
return rc2;
}
Expand Down
4 changes: 2 additions & 2 deletions security/selinux/include/avc.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ static inline int avc_audit(u32 ssid, u32 tsid,
u16 tclass, u32 requested,
struct av_decision *avd,
int result,
struct common_audit_data *a, unsigned flags)
struct common_audit_data *a)
{
u32 audited, denied;
audited = avc_audit_required(requested, avd, result, 0, &denied);
if (likely(!audited))
return 0;
return slow_avc_audit(ssid, tsid, tclass,
requested, audited, denied,
a, flags);
a, 0);
}

#define AVC_STRICT 1 /* Ignore permissive mode. */
Expand Down

0 comments on commit ab35406

Please sign in to comment.