OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: af_key: fix sadb_x_filter validation 

[ Upstream commit 75065a8929 ]

When running xfrm_state_walk_init(), the xfrm_address_filter being used
is okay to have a splen/dplen that equals to sizeof(xfrm_address_t)<<3.
This commit replaces >= to > to make sure the boundary checking is
correct.

Fixes: 37bd22420f ("af_key: pfkey_dump needs parameter validation")
Signed-off-by: Lin Ma <linma@zju.edu.cn>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lin Ma 2023-06-27 11:39:54 +08:00 committed by Greg Kroah-Hartman
parent 9a0056276f
commit 479884b4ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/key/af_key.c
View File

@ -1848,9 +1848,9 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms
if (ext_hdrs[SADB_X_EXT_FILTER - 1]) { if (ext_hdrs[SADB_X_EXT_FILTER - 1]) {
struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER - 1]; struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER - 1];
if ((xfilter->sadb_x_filter_splen >= if ((xfilter->sadb_x_filter_splen >
(sizeof(xfrm_address_t) << 3)) || (sizeof(xfrm_address_t) << 3)) ||
(xfilter->sadb_x_filter_dplen >= (xfilter->sadb_x_filter_dplen >
(sizeof(xfrm_address_t) << 3))) { (sizeof(xfrm_address_t) << 3))) {
mutex_unlock(&pfk->dump_lock); mutex_unlock(&pfk->dump_lock);
return -EINVAL; return -EINVAL;