summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-06-14 13:35:37 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-05 14:40:28 +0200
commitc460f2beb6f081fa22eb7291db49c13c266ffd86 (patch)
tree708a4f3fb396462bd0aae27e6e90fac82526d4e6
parent1e1666257cb69022e7a6fe61b1cf041a852ce1bc (diff)
downloadlinux-stable-c460f2beb6f081fa22eb7291db49c13c266ffd86.tar.gz
linux-stable-c460f2beb6f081fa22eb7291db49c13c266ffd86.tar.bz2
linux-stable-c460f2beb6f081fa22eb7291db49c13c266ffd86.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>
-rw-r--r--net/key/af_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index f9c9ecb0cdd3..4f5992966924 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;