Skip to content

Commit

Permalink
net: avoid NULL deref in inet_ctl_sock_destroy()
Browse files Browse the repository at this point in the history
[ Upstream commit 8fa677d ]

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: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Eric Dumazet authored and Ben Hutchings committed Nov 27, 2015
1 parent 33cf84b commit f79c83d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/net/inet_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ extern 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

0 comments on commit f79c83d

Please sign in to comment.