Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab354062 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

selinux: remove 'flags' parameter from avc_audit() 



Now avc_audit() has no more users with that parameter. Remove it.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cb4fbe57

security/selinux/avc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

security/selinux/include/avc.h

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 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);
@@ -138,7 +138,7 @@ static inline int avc_audit(u32 ssid, u32 tsid, 
		return 0;

	return slow_avc_audit(ssid, tsid, tclass,

			      requested, audited, denied,

			      a, flags);

			      a, 0);

}



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