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>
This commit is contained in:
Родитель
33d1d2c52c
Коммит
859f4c74d8
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче