Commit 859f4c74 authored Oct 06, 2008 by Jarek Poplawski Committed by David S. Miller Oct 06, 2008

netrom: Fix sock_orphan() use in nr_release



While debugging another bug it was found that NetRom socks
are sometimes seen unorphaned in sk_free(). This patch moves
sock_orphan() in nr_release() to the beginning (like in ax25,
or rose).

Reported-and-tested-by: Bernard Pidoux f6bvp <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 33d1d2c5

net/netrom/af_netrom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -525,6 +525,7 @@ static int nr_release(struct socket *sock)
		if (sk == NULL) return 0;

		sock_hold(sk);
		sock_orphan(sk);
		lock_sock(sk);
		nr = nr_sk(sk);

		@@ -548,7 +549,6 @@ static int nr_release(struct socket *sock)
		sk->sk_state = TCP_CLOSE;
		sk->sk_shutdown \|= SEND_SHUTDOWN;
		sk->sk_state_change(sk);
		sock_orphan(sk);
		sock_set_flag(sk, SOCK_DESTROY);
		break;

Admin message