aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-17 06:05:13 -0400
committerDavid S. Miller <davem@davemloft.net>2008-06-17 06:05:13 -0400
commitc751e4f8b32a3869bb4fec12100952abd9baa0e1 (patch)
tree2f930ab33e089bcde9b8fc12b272a6298a5e14e2
parent0efffaf9d57f54a864b739176d1f659a69486e8b (diff)
x25: Use sock_orphan() instead of open-coded (and buggy) variant.
It doesn't grab the sk_callback_lock, it doesn't NULL out the sk->sk_sleep waitqueue pointer, etc. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/x25/af_x25.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index bcb091f713ec..7b1c6ef04553 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -612,8 +612,7 @@ static int x25_release(struct socket *sock)
612 break; 612 break;
613 } 613 }
614 614
615 sock->sk = NULL; 615 sock_orphan(sk);
616 sk->sk_socket = NULL; /* Not used, but we should do this */
617out: 616out:
618 return 0; 617 return 0;
619} 618}