diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-11-02 07:50:07 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-27 12:48:25 +0000 |
| commit | f79c83d6c41930362bc66fc71489e92975a2facf (patch) | |
| tree | f6d797a0a84eb9ae241034bdc7a65cf79026cf0c | |
| parent | 33cf84ba8c25b40c7de52029efc8d4372725c95f (diff) | |
net: avoid NULL deref in inet_ctl_sock_destroy()
[ 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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | include/net/inet_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index 22fac9892b16..df3be8f857c5 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -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 |