From: Eric Dumazet <edumazet@google.com>
Date: Mon, 2 Nov 2015 15:50:07 +0000 (-0800)
Subject: net: avoid NULL deref in inet_ctl_sock_destroy()
X-Git-Tag: v3.16.35~1061
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=299b6c906f0d39eb6ad0e91089c6c2000fc575fc;p=thirdparty%2Fkernel%2Fstable.git

net: avoid NULL deref in inet_ctl_sock_destroy()

commit 8fa677d2706d325d71dab91bf6e6512c05214e37 upstream.

Under low memory conditions, tcp_sk_init() and icmp_sk_init()
can both iterate on all possible cpus and call inet_ctl_sock_destroy(),
with eventual NULL pointer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index fe7994c48b756..fd1da045dabce 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -40,7 +40,8 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,
 
 static inline void inet_ctl_sock_destroy(struct sock *sk)
 {
-	sk_release_kernel(sk);
+	if (sk)
+		sk_release_kernel(sk);
 }
 
 #endif