Commit 32cc777c authored Jun 27, 2023 by Lin Ma Committed by Greg Kroah-Hartman Aug 30, 2023

net: af_key: fix sadb_x_filter validation



[ Upstream commit 75065a8929069bc93181848818e23f147a73f83a ]

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: 37bd22420f85 ("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>

parent 373848d5

net/key/af_key.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1852,9 +1852,9 @@ static int pfkey_dump(struct sock sk, struct sk_buff skb, const struct sadb_ms
		if (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)) \|\|
		(xfilter->sadb_x_filter_dplen >=
		(xfilter->sadb_x_filter_dplen >
		(sizeof(xfrm_address_t) << 3))) {
		mutex_unlock(&pfk->dump_lock);
		return -EINVAL;