aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-01 22:02:47 -0400
committerThierry Strudel <tstrudel@google.com>2015-07-28 10:45:26 -0700
commitc16a3c626a7e04b099f341e4df3f2a0f1c869b9c (patch)
treeadb02ac9701aa32c0ded489a3580b0056778b9cf
parent8887dbc8268265461fa55dd03b118c865f9364e9 (diff)
ipv4: Missing sk_nulls_node_init() in ping_unhash().android-5.1.1_r0.21
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 8892913b270f..9f89b0a0a3b8 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;