diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-10-03 02:54:31 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-11-14 19:04:51 +0300 |
| commit | 6651ab3cd17428ac02a53a2f0e90f089a203f03c (patch) | |
| tree | 7ea2d4f63ea452ccb9377cbb294167e7500d207b | |
| parent | 1df1b617c4884a39627da12a64caf5755951b026 (diff) | |
| download | linux-6651ab3cd17428ac02a53a2f0e90f089a203f03c.tar.xz | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 |