]> git.hungrycats.org Git - linux/commitdiff
net: avoid NULL deref in inet_ctl_sock_destroy()
authorEric Dumazet <edumazet@google.com>
Fri, 2 Oct 2015 23:54:31 +0000 (16:54 -0700)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 3 Dec 2015 15:17:20 +0000 (10:17 -0500)
[ Upstream commit 8fa677d2706d325d71dab91bf6e6512c05214e37 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
include/net/inet_common.h

index b2828a06a5a63355f1aa2be27e74a472cc99fc62..a7d812d05fba814b5498221961cc09260f617348 100644 (file)
@@ -42,7 +42,8 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len,
 
 static inline void inet_ctl_sock_destroy(struct sock *sk)
 {
-       sk_release_kernel(sk);
+       if (sk)
+               sk_release_kernel(sk);
 }
 
 #endif