Commit 96ef5289 authored by Lin Ma's avatar Lin Ma Committed by sanglipeng
Browse files

net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure 

stable inclusion
from stable-v5.10.192
commit 0f89909c80a9d426f98d4ada1ac0811372ac509f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I933RF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0f89909c80a9d426f98d4ada1ac0811372ac509f



--------------------------------

[ Upstream commit d1e0e61d ]

According to all consumers code of attrs[XFRMA_SEC_CTX], like

* verify_sec_ctx_len(), convert to xfrm_user_sec_ctx*
* xfrm_state_construct(), call security_xfrm_state_alloc whose prototype
is int security_xfrm_state_alloc(.., struct xfrm_user_sec_ctx *sec_ctx);
* copy_from_user_sec_ctx(), convert to xfrm_user_sec_ctx *
...

It seems that the expected parsing result for XFRMA_SEC_CTX should be
structure xfrm_user_sec_ctx, and the current xfrm_sec_ctx is confusing
and misleading (Luckily, they happen to have same size 8 bytes).

This commit amend the policy structure to xfrm_user_sec_ctx to avoid
ambiguity.

Fixes: cf5cb79f ("[XFRM] netlink: Establish an attribute policy")
Signed-off-by: default avatarLin Ma <linma@zju.edu.cn>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent c9212ea5

net/xfrm/xfrm_compat.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { 
	[XFRMA_ALG_COMP]	= { .len = sizeof(struct xfrm_algo) },

	[XFRMA_ENCAP]		= { .len = sizeof(struct xfrm_encap_tmpl) },

	[XFRMA_TMPL]		= { .len = sizeof(struct xfrm_user_tmpl) },

	[XFRMA_SEC_CTX]		= { .len = sizeof(struct xfrm_sec_ctx) },

	[XFRMA_SEC_CTX]		= { .len = sizeof(struct xfrm_user_sec_ctx) },

	[XFRMA_LTIME_VAL]	= { .len = sizeof(struct xfrm_lifetime_cur) },

	[XFRMA_REPLAY_VAL]	= { .len = sizeof(struct xfrm_replay_state) },

	[XFRMA_REPLAY_THRESH]	= { .type = NLA_U32 },

net/xfrm/xfrm_user.c

+1 −1
Original line number Diff line number Diff line
@@ -2633,7 +2633,7 @@ const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { 
	[XFRMA_ALG_COMP]	= { .len = sizeof(struct xfrm_algo) },

	[XFRMA_ENCAP]		= { .len = sizeof(struct xfrm_encap_tmpl) },

	[XFRMA_TMPL]		= { .len = sizeof(struct xfrm_user_tmpl) },

	[XFRMA_SEC_CTX]		= { .len = sizeof(struct xfrm_sec_ctx) },

	[XFRMA_SEC_CTX]		= { .len = sizeof(struct xfrm_user_sec_ctx) },

	[XFRMA_LTIME_VAL]	= { .len = sizeof(struct xfrm_lifetime_cur) },

	[XFRMA_REPLAY_VAL]	= { .len = sizeof(struct xfrm_replay_state) },

	[XFRMA_REPLAY_THRESH]	= { .type = NLA_U32 },