Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1287406

[PATCH 3.16.y-ckt 011/126] net: avoid NULL deref in inet_ctl_sock_destroy()

Show all headers | View raw

3.16.7-ckt21 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>

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>
---
 include/net/inet_common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index fe7994c48b75..fd1da045dabc 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[3.16.y-ckt stable] Linux 3.16.7-ckt21 stable review Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
  [PATCH 3.16.y-ckt 011/126] net: avoid NULL deref in inet_ctl_sock_destroy() Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
  [PATCH 3.16.y-ckt 005/126] stmmac: Correctly report PTP capabilities. Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
  [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
    Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx Bjørn Mork <bjorn@mork.no> - 2015-12-09 12:30 +0100
      Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless  MC74xx/EM74xx Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 12:50 +0100

csiph-web