diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-06-14 13:35:37 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-05 14:41:40 +0200 |
| commit | f37a5bfa5cf7ceb330367947dab8a8083282795f (patch) | |
| tree | 35cb85fd55af400a2e9a04bb0c2babef873c3b17 /net | |
| parent | 29be0c1aefd38f07c5b0547c2f6d7423873c9aca (diff) | |
| download | linux-stable-f37a5bfa5cf7ceb330367947dab8a8083282795f.tar.gz linux-stable-f37a5bfa5cf7ceb330367947dab8a8083282795f.tar.bz2 linux-stable-f37a5bfa5cf7ceb330367947dab8a8083282795f.zip | |
xfrm: NULL dereference on allocation failure
commit e747f64336fc15e1c823344942923195b800aa1e upstream.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 eb63a586b555..d07045ddfded 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1157,6 +1157,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; |