[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20080617.030646.266233676.davem@davemloft.net>
Date: Tue, 17 Jun 2008 03:06:46 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: eis@...y.hanse.de
CC: linux-x25@...r.kernel.org, netdev@...r.kernel.org,
ralf@...ux-mips.org, linux-hams@...r.kernel.org
Subject: [PATCH]: Fix open-coded sock_orphan() in x25.
This is similar to the AF_ECONET patch I just posted.
Applied and pushed to net-next-2.6
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@...emloft.net>
---
net/x25/af_x25.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index bcb091f..7b1c6ef 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -612,8 +612,7 @@ static int x25_release(struct socket *sock)
break;
}
- sock->sk = NULL;
- sk->sk_socket = NULL; /* Not used, but we should do this */
+ sock_orphan(sk);
out:
return 0;
}
--
1.5.5.1.308.g1fbb5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists