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

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

selinux: avc_has_perm_flags has no more users 



.. so get rid of it.  The only indirect users were all the
avc_has_perm() callers which just expanded to have a zero flags
argument.

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

security/selinux/avc.c

+3 −6
Original line number Diff line number Diff line
@@ -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, 0);

	if (rc2)

		return rc2;

	return rc;

security/selinux/include/avc.h

+3 −11
Original line number Diff line number Diff line
@@ -147,17 +147,9 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid, 
			 unsigned flags,

			 struct av_decision *avd);



int avc_has_perm_flags(u32 ssid, u32 tsid,

int avc_has_perm(u32 ssid, u32 tsid,

		 u16 tclass, u32 requested,

		       struct common_audit_data *auditdata,

		       unsigned);



static inline int avc_has_perm(u32 ssid, u32 tsid,

			       u16 tclass, u32 requested,

			       struct common_audit_data *auditdata)

{

	return avc_has_perm_flags(ssid, tsid, tclass, requested, auditdata, 0);

}

		 struct common_audit_data *auditdata);



u32 avc_policy_seqno(void);