]> git.hungrycats.org Git - linux/commitdiff
xfrm: NULL dereference on allocation failure
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 14 Jun 2017 10:35:37 +0000 (13:35 +0300)
committerSasha Levin <alexander.levin@verizon.com>
Mon, 31 Jul 2017 17:37:51 +0000 (13:37 -0400)
[ Upstream commit e747f64336fc15e1c823344942923195b800aa1e ]

The default error code in pfkey_msg2xfrm_state() is -ENOBUFS.  We
added a new call to security_xfrm_state_alloc() which sets "err" to zero
so there several places where we can return ERR_PTR(0) if kmalloc()
fails.  The caller is expecting error pointers so it leads to a NULL
dereference.

Fixes: df71837d5024 ("[LSM-IPSec]: Security association restriction.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
net/key/af_key.c

index f0d52d721b3a4405b47f38d8f5d6c1990cbf8b5f..6f1f6595da65708b04cfeedc9781098d9d791bbb 100644 (file)
@@ -1135,6 +1135,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                        goto out;
        }
 
+       err = -ENOBUFS;
        key = ext_hdrs[SADB_EXT_KEY_AUTH - 1];
        if (sa->sadb_sa_auth) {
                int keysize = 0;