From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 Jun 2008 10:19:58 +0000 (-0700)
Subject: netrom: Kill spurious NULL'ing of sk->sk_socket.
X-Git-Tag: v2.6.27-rc1~969^2~304
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=48c5732f4ac0621a2fdde006d55a6621a47a728f;p=linux-2.6-omap-h63xx.git

netrom: Kill spurious NULL'ing of sk->sk_socket.

In nr_release(), one code path calls sock_orphan() which
will NULL out sk->sk_socket already.

In the other case, handling states other than NR_STATE_{0,1,2,3},
seems to not be possible other than due to bugs.  Even for an
uninitialized nr->state value, that would be zero or NR_STATE_0.
It might be wise to stick a WARN_ON() here.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 58779624cdb..74884f4a625 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -536,11 +536,9 @@ static int nr_release(struct socket *sock)
 		sk->sk_state_change(sk);
 		sock_orphan(sk);
 		sock_set_flag(sk, SOCK_DESTROY);
-		sk->sk_socket   = NULL;
 		break;
 
 	default:
-		sk->sk_socket = NULL;
 		break;
 	}