Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 859f4c74d8de4dc344b3a115367d5e22a79bddaf

Authored by Jarek Poplawski
Committed by David S. Miller
1 parent 33d1d2c52c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

net/netrom/af_netrom.c
Diff comments   View file @ 859f4c7
... ... @@ -525,6 +525,7 @@
525 525 if (sk == NULL) return 0;
526 526  
527 527 sock_hold(sk);
  528 + sock_orphan(sk);
528 529 lock_sock(sk);
529 530 nr = nr_sk(sk);
530 531  
... ... @@ -548,7 +549,6 @@
548 549 sk->sk_state = TCP_CLOSE;
549 550 sk->sk_shutdown |= SEND_SHUTDOWN;
550 551 sk->sk_state_change(sk);
551   - sock_orphan(sk);
552 552 sock_set_flag(sk, SOCK_DESTROY);
553 553 break;
554 554