Commit aaa966bb authored Dec 16, 2013 by Osvaldo Banuelos

Revert "tcp: call sock_orphan() before freeing socket in tcp_nuke_addr"



This reverts commit 3d78ff9d.
Although the standard is to detach sockets from process contexts prior
to freeing them, under some conditions doing this in tcp_nuke_addr()
will cause a null socket dereference in sk_wait_data(). To avoid this
scenario, it may be necessary to purge the sk_receive queue and place
additional checks to ensure a socket is orphaned only when it will be
freed.

Change-Id: I880ea9e2cd259eebbc40a81a32b96b4af8c36f95
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>

parent cadcc68d

net/ipv4/tcp.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -3562,10 +3562,7 @@ restart:
		tcp_done(sk);
		bh_unlock_sock(sk);
		local_bh_enable();
		if (!sock_flag(sk, SOCK_DEAD)) {
		sock_orphan(sk);
		sock_put(sk);
		}

		goto restart;
		}