Browse Source

net: avoid NULL deref in inet_ctl_sock_destroy()

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>
Eric Dumazet 9 years ago
parent
commit
8fa677d270
1 changed files with 2 additions and 1 deletions
  1. 2 1
      include/net/inet_common.h

+ 2 - 1
include/net/inet_common.h

@@ -41,7 +41,8 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len,
 
 
 static inline void inet_ctl_sock_destroy(struct sock *sk)
 static inline void inet_ctl_sock_destroy(struct sock *sk)
 {
 {
-	sock_release(sk->sk_socket);
+	if (sk)
+		sock_release(sk->sk_socket);
 }
 }
 
 
 #endif
 #endif