Commit 72c2dfde authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 



Steffen Klassert says:

====================
1) Fix a sleep in atomic when pfkey_sadb2xfrm_user_sec_ctx()
   is called from pfkey_compile_policy().
   Fix from Nikolay Aleksandrov.

2) security_xfrm_policy_alloc() can be called in process and atomic
   context. Add an argument to let the callers choose the appropriate
   way. Fix from Nikolay Aleksandrov.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b085f311 52a4c640

include/linux/security.h

+7 −3
Original line number Diff line number Diff line
@@ -1040,6 +1040,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	Allocate a security structure to the xp->security field; the security

 *	field is initialized to NULL when the xfrm_policy is allocated.

 *	Return 0 if operation was successful (memory to allocate, legal context)

 *	@gfp is to specify the context for the allocation

 * @xfrm_policy_clone_security:

 *	@old_ctx contains an existing xfrm_sec_ctx.

 *	@new_ctxp contains a new xfrm_sec_ctx being cloned from old.
@@ -1683,7 +1684,7 @@ struct security_operations { 


#ifdef CONFIG_SECURITY_NETWORK_XFRM

	int (*xfrm_policy_alloc_security) (struct xfrm_sec_ctx **ctxp,

			struct xfrm_user_sec_ctx *sec_ctx);

			struct xfrm_user_sec_ctx *sec_ctx, gfp_t gfp);

	int (*xfrm_policy_clone_security) (struct xfrm_sec_ctx *old_ctx, struct xfrm_sec_ctx **new_ctx);

	void (*xfrm_policy_free_security) (struct xfrm_sec_ctx *ctx);

	int (*xfrm_policy_delete_security) (struct xfrm_sec_ctx *ctx);
@@ -2859,7 +2860,8 @@ static inline void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) 


#ifdef CONFIG_SECURITY_NETWORK_XFRM



int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx);

int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp,

			       struct xfrm_user_sec_ctx *sec_ctx, gfp_t gfp);

int security_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx, struct xfrm_sec_ctx **new_ctxp);

void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx);

int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx);
@@ -2877,7 +2879,9 @@ void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl); 


#else	/* CONFIG_SECURITY_NETWORK_XFRM */



static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx)

static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp,

					     struct xfrm_user_sec_ctx *sec_ctx,

					     gfp_t gfp)

{

	return 0;

}

net/key/af_key.c

+10 −9
Original line number Diff line number Diff line
@@ -433,12 +433,13 @@ static inline int verify_sec_ctx_len(const void *p) 
	return 0;

}



static inline struct xfrm_user_sec_ctx *pfkey_sadb2xfrm_user_sec_ctx(const struct sadb_x_sec_ctx *sec_ctx)

static inline struct xfrm_user_sec_ctx *pfkey_sadb2xfrm_user_sec_ctx(const struct sadb_x_sec_ctx *sec_ctx,

								     gfp_t gfp)

{

	struct xfrm_user_sec_ctx *uctx = NULL;

	int ctx_size = sec_ctx->sadb_x_ctx_len;



	uctx = kmalloc((sizeof(*uctx)+ctx_size), GFP_KERNEL);

	uctx = kmalloc((sizeof(*uctx)+ctx_size), gfp);



	if (!uctx)

		return NULL;
@@ -1124,7 +1125,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, 


	sec_ctx = ext_hdrs[SADB_X_EXT_SEC_CTX - 1];

	if (sec_ctx != NULL) {

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx);

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx, GFP_KERNEL);



		if (!uctx)

			goto out;
@@ -2231,14 +2232,14 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, const struct sadb_ 


	sec_ctx = ext_hdrs[SADB_X_EXT_SEC_CTX - 1];

	if (sec_ctx != NULL) {

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx);

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx, GFP_KERNEL);



		if (!uctx) {

			err = -ENOBUFS;

			goto out;

		}



		err = security_xfrm_policy_alloc(&xp->security, uctx);

		err = security_xfrm_policy_alloc(&xp->security, uctx, GFP_KERNEL);

		kfree(uctx);



		if (err)
@@ -2335,12 +2336,12 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, const struct sa 


	sec_ctx = ext_hdrs[SADB_X_EXT_SEC_CTX - 1];

	if (sec_ctx != NULL) {

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx);

		struct xfrm_user_sec_ctx *uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx, GFP_KERNEL);



		if (!uctx)

			return -ENOMEM;



		err = security_xfrm_policy_alloc(&pol_ctx, uctx);

		err = security_xfrm_policy_alloc(&pol_ctx, uctx, GFP_KERNEL);

		kfree(uctx);

		if (err)

			return err;
@@ -3239,8 +3240,8 @@ static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt, 
		}

		if ((*dir = verify_sec_ctx_len(p)))

			goto out;

		uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx);

		*dir = security_xfrm_policy_alloc(&xp->security, uctx);

		uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx, GFP_ATOMIC);

		*dir = security_xfrm_policy_alloc(&xp->security, uctx, GFP_ATOMIC);

		kfree(uctx);



		if (*dir)

net/xfrm/xfrm_user.c

+3 −3
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ static int copy_from_user_sec_ctx(struct xfrm_policy *pol, struct nlattr **attrs 
		return 0;



	uctx = nla_data(rt);

	return security_xfrm_policy_alloc(&pol->security, uctx);

	return security_xfrm_policy_alloc(&pol->security, uctx, GFP_KERNEL);

}



static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
@@ -1626,7 +1626,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, 
		if (rt) {

			struct xfrm_user_sec_ctx *uctx = nla_data(rt);



			err = security_xfrm_policy_alloc(&ctx, uctx);

			err = security_xfrm_policy_alloc(&ctx, uctx, GFP_KERNEL);

			if (err)

				return err;

		}
@@ -1928,7 +1928,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, 
		if (rt) {

			struct xfrm_user_sec_ctx *uctx = nla_data(rt);



			err = security_xfrm_policy_alloc(&ctx, uctx);

			err = security_xfrm_policy_alloc(&ctx, uctx, GFP_KERNEL);

			if (err)

				return err;

		}

security/capability.c

+2 −1
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ static void cap_skb_owned_by(struct sk_buff *skb, struct sock *sk) 


#ifdef CONFIG_SECURITY_NETWORK_XFRM

static int cap_xfrm_policy_alloc_security(struct xfrm_sec_ctx **ctxp,

					  struct xfrm_user_sec_ctx *sec_ctx)

					  struct xfrm_user_sec_ctx *sec_ctx,

					  gfp_t gfp)

{

	return 0;

}

security/security.c

+4 −2
Original line number Diff line number Diff line
@@ -1317,9 +1317,11 @@ void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) 


#ifdef CONFIG_SECURITY_NETWORK_XFRM



int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx)

int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp,

			       struct xfrm_user_sec_ctx *sec_ctx,

			       gfp_t gfp)

{

	return security_ops->xfrm_policy_alloc_security(ctxp, sec_ctx);

	return security_ops->xfrm_policy_alloc_security(ctxp, sec_ctx, gfp);

}

EXPORT_SYMBOL(security_xfrm_policy_alloc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE