summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Akue <loicx.akue@intel.com>2015-11-16 11:39:35 +0100
committerVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2015-11-16 13:52:58 +0100
commitd9b4aa6873cda0bd2afcdc57271603b88f0fff2b (patch)
treeb2ff6c770ceb872be2ceac8d7aee8a74a7071c57
parent2bc390228c1541f244e2c55f44bd529a7a5016c8 (diff)
downloadx86-android-x86-grant-3.10-lollipop-mr1-wear-release.tar.gz
ipv4: Missing sk_nulls_node_init() in ping_unhash().android-wear-5.1.1_r0.19android-x86-grant-3.10-lollipop-mr1-wear-release
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(). Change-Id: Ieff82a38f18fae5f87be6a242529a26eb195882f Tested-by: Linus Torvalds <torvalds@linux-foundation.org> Reported-by: Wen Xu <hotdog3645@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1003
-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 530d290c937e..77e93d9dc9a5 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;