Commit 6bd344e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux 

Pull SELinux updates from Paul Moore:

 - The slow_avc_audit() function is now non-blocking so we can remove
   the AVC_NONBLOCKING tricks; this also includes the 'flags' variant of
   avc_has_perm().

 - Use kmemdup() instead of kcalloc()+copy when copying parts of the
   SELinux policydb.

 - The InfiniBand device name is now passed by reference when possible
   in the SELinux code, removing a strncpy().

 - Minor cleanups including: constification of avtab function args,
   removal of useless LSM/XFRM function args, SELinux kdoc fixes, and
   removal of redundant assignments.

* tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: kill 'flags' argument in avc_has_perm_flags() and avc_audit()
  selinux: slow_avc_audit has become non-blocking
  selinux: Fix kernel-doc
  selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC
  lsm_audit,selinux: pass IB device name by reference
  selinux: Remove redundant assignment to rc
  selinux: Corrected comment to match kernel-doc comment
  selinux: delete selinux_xfrm_policy_lookup() useless argument
  selinux: constify some avtab function arguments
  selinux: simplify duplicate_policydb_cond_list() by using kmemdup()
parents 44b6ed4c d99cf13f

include/linux/lsm_audit.h

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct lsm_ibpkey_audit { 
};



struct lsm_ibendport_audit {

	char	dev_name[IB_DEVICE_NAME_MAX];

	const char *dev_name;

	u8 port;

};

include/linux/lsm_hook_defs.h

+1 −2
Original line number Diff line number Diff line
@@ -358,8 +358,7 @@ LSM_HOOK(int, 0, xfrm_state_alloc_acquire, struct xfrm_state *x, 
	 struct xfrm_sec_ctx *polsec, u32 secid)

LSM_HOOK(void, LSM_RET_VOID, xfrm_state_free_security, struct xfrm_state *x)

LSM_HOOK(int, 0, xfrm_state_delete_security, struct xfrm_state *x)

LSM_HOOK(int, 0, xfrm_policy_lookup, struct xfrm_sec_ctx *ctx, u32 fl_secid,

	 u8 dir)

LSM_HOOK(int, 0, xfrm_policy_lookup, struct xfrm_sec_ctx *ctx, u32 fl_secid)

LSM_HOOK(int, 1, xfrm_state_pol_flow_match, struct xfrm_state *x,

	 struct xfrm_policy *xp, const struct flowi_common *flic)

LSM_HOOK(int, 0, xfrm_decode_session, struct sk_buff *skb, u32 *secid,

include/linux/security.h

+2 −2
Original line number Diff line number Diff line
@@ -1681,7 +1681,7 @@ int security_xfrm_state_alloc_acquire(struct xfrm_state *x, 
				      struct xfrm_sec_ctx *polsec, u32 secid);

int security_xfrm_state_delete(struct xfrm_state *x);

void security_xfrm_state_free(struct xfrm_state *x);

int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);

int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid);

int security_xfrm_state_pol_flow_match(struct xfrm_state *x,

				       struct xfrm_policy *xp,

				       const struct flowi_common *flic);
@@ -1732,7 +1732,7 @@ static inline int security_xfrm_state_delete(struct xfrm_state *x) 
	return 0;

}



static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)

static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid)

{

	return 0;

}

net/xfrm/xfrm_policy.c

+2 −4
Original line number Diff line number Diff line
@@ -1902,8 +1902,7 @@ static int xfrm_policy_match(const struct xfrm_policy *pol, 


	match = xfrm_selector_match(sel, fl, family);

	if (match)

		ret = security_xfrm_policy_lookup(pol->security, fl->flowi_secid,

						  dir);

		ret = security_xfrm_policy_lookup(pol->security, fl->flowi_secid);

	return ret;

}
@@ -2181,8 +2180,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, 
				goto out;

			}

			err = security_xfrm_policy_lookup(pol->security,

						      fl->flowi_secid,

						      dir);

						      fl->flowi_secid);

			if (!err) {

				if (!xfrm_pol_hold_rcu(pol))

					goto again;

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -2466,9 +2466,9 @@ void security_xfrm_state_free(struct xfrm_state *x) 
	call_void_hook(xfrm_state_free_security, x);

}



int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)

int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid)

{

	return call_int_hook(xfrm_policy_lookup, 0, ctx, fl_secid, dir);

	return call_int_hook(xfrm_policy_lookup, 0, ctx, fl_secid);

}



int security_xfrm_state_pol_flow_match(struct xfrm_state *x,