diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-10-06 12:54:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-06 12:54:57 -0700 |
| commit | 859f4c74d8de4dc344b3a115367d5e22a79bddaf (patch) | |
| tree | 4e91e7053094c5b71c00fdc7e018f2262cfbbfd4 | |
| parent | 33d1d2c52c3befa6c4df33b4ba58137d1c48894b (diff) | |
| download | op-kernel-dev-859f4c74d8de4dc344b3a115367d5e22a79bddaf.zip op-kernel-dev-859f4c74d8de4dc344b3a115367d5e22a79bddaf.tar.gz | |
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>
| -rw-r--r-- | net/netrom/af_netrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 532e4fa..9f1ea4a 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -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; |
