diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-01 22:02:47 -0400 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2015-08-11 22:06:30 -0700 |
| commit | 88d1df13f14975ea9d87690a10008545c88051b2 (patch) | |
| tree | 478b9c25d2671aa2f425b1dbbe12c50f17bf9b24 | |
| parent | ad6206721a56cf16e98b9d01494ece4193722f9f (diff) | |
| download | x86_64-88d1df13f14975ea9d87690a10008545c88051b2.tar.gz | |
ipv4: Missing sk_nulls_node_init() in ping_unhash().android-5.1.1_r0.18android-5.1.0_r0.18android-x86_64-fugu-3.10-lollipop-mr1
If we don't do that, then the poison value is left in the ->pprev
backlink.
This can cause crashes if we do a disconnect, followed by a connect().
Tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: Wen Xu <hotdog3645@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Bug: 20770158
Change-Id: I944eb20fddea190892c2da681d934801d268096b
| -rw-r--r-- | net/ipv4/ping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index d03caf30e0bd..da97e01ab0da 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -154,6 +154,7 @@ void ping_unhash(struct sock *sk) if (sk_hashed(sk)) { write_lock_bh(&ping_table.lock); hlist_nulls_del(&sk->sk_nulls_node); + sk_nulls_node_init(&sk->sk_nulls_node); sock_put(sk); isk->inet_num = 0; isk->inet_sport = 0; |