Commit 37bd2242 authored Jul 22, 2020 by Mark Salyzyn Committed by Steffen Klassert Jul 22, 2020

af_key: pfkey_dump needs parameter validation

In pfkey_dump() dplen and splen can both be specified to access the
xfrm_address_t structure out of bounds in__xfrm_state_filter_match()
when it calls addr_match() with the indexes.  Return EINVAL if either
are out of range.

Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: kernel-team@android.com
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 101dde42

net/key/af_key.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1849,6 +1849,13 @@ 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 >=
		(sizeof(xfrm_address_t) << 3)) \|\|
		(xfilter->sadb_x_filter_dplen >=
		(sizeof(xfrm_address_t) << 3))) {
		mutex_unlock(&pfk->dump_lock);
		return -EINVAL;
		}
		filter = kmalloc(sizeof(*filter), GFP_KERNEL);
		if (filter == NULL) {
		mutex_unlock(&pfk->dump_lock);

Admin message