Commit 48c5732f authored Jun 17, 2008 by David S. Miller

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>

parent c751e4f8

net/netrom/af_netrom.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -536,11 +536,9 @@ static int nr_release(struct socket *sock)
	sk->sk_state_change(sk);		sk->sk_state_change(sk);
	sock_orphan(sk);		sock_orphan(sk);
	sock_set_flag(sk, SOCK_DESTROY);		sock_set_flag(sk, SOCK_DESTROY);
	sk->sk_socket = NULL;
	break;		break;

	default:		default:
	sk->sk_socket = NULL;
	break;		break;
	}		}