summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@android.com>2020-07-22 04:00:53 -0700
committerSteffen Klassert <steffen.klassert@secunet.com>2020-07-22 13:33:22 +0200
commit37bd22420f856fcd976989f1d4f1f7ad28e1fcac (patch)
tree02c77754ef032f73755b316c72013c5075fb6c64 /net/key
parent101dde4207f1daa1fda57d714814a03835dccc3f (diff)
downloadlinux-stable-37bd22420f856fcd976989f1d4f1f7ad28e1fcac.tar.gz
linux-stable-37bd22420f856fcd976989f1d4f1f7ad28e1fcac.tar.bz2
linux-stable-37bd22420f856fcd976989f1d4f1f7ad28e1fcac.zip
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: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 979c579afc63..a915bc86620a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -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);