diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-11-02 07:50:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-09 13:40:06 -0500 |
| commit | 0861d012ecff07b74a8c6ecfda04bb1737831e09 (patch) | |
| tree | 9e1433374d0ebe34423e23d98f9598451128848f /include | |
| parent | 25e462d9e34f8bb0cdaab78093c61373048d13a3 (diff) | |
| download | linux-stable-0861d012ecff07b74a8c6ecfda04bb1737831e09.tar.gz linux-stable-0861d012ecff07b74a8c6ecfda04bb1737831e09.tar.bz2 linux-stable-0861d012ecff07b74a8c6ecfda04bb1737831e09.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -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 234008782c8c..102fc42c7fb1 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -40,7 +40,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 |