ipv4: Missing sk_nulls_node_init() in ping_unhash().
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 May 2015 02:02:47 +0000 (22:02 -0400)
committerMark Salyzyn <salyzyn@google.com>
Mon, 4 May 2015 14:19:31 +0000 (07:19 -0700)
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

net/ipv4/ping.c

index 8642f0044dfa8662db2250bcaab7162d2244e230..32d894fa107112e2afb34425d7216fba72efbd1b 100644 (file)
@@ -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;