diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-06-14 13:35:37 +0300 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:51 -0400 |
commit | 1a6224f1a27f6e4946df3037530b0eb8c7e2ba7b (patch) | |
tree | 8c12b825f3d283c7f5f065a2fb538ad302ab86f2 /net/key | |
parent | 0e6595717cef0eceabd1ac0daf7009b9286cf4fa (diff) |
xfrm: NULL dereference on allocation failure
[ 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>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index f0d52d721b3a..6f1f6595da65 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -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; |