af_key: pfkey_dump needs parameter validation
Subsystems (3)
PATCH v2 1/1 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 <[email protected]>
Cc Steffen Klassert <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Jakub Kicinski <[email protected]>
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
---
v2: Added Fixes tag
net/key/af_key.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/key/af_key.c +7 -0
@@ -1849,6 +1849,13 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msif (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);
Signature · 1 line
2.28.0.rc0.105.gf9edc3c819-goog
Quoted 5 lines · Mark Salyzyn
In
pfkey_dump()dplen and splen can both be specified to access thexfrm_address_tstructure out of boundsin__xfrm_state_filter_match()when it callsaddr_match()with the indexes. Return EINVAL if either are out of range.
Quoted 9 lines
Signed-off-by Mark Salyzyn <[email protected]>Cc Steffen Klassert <[email protected]>Cc Herbert Xu <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Applied, thanks a lot!