summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrew Morton2007-12-12 20:24:19 +0100
committerDavid S. Miller2007-12-14 22:54:37 +0100
commit98eb5683fb94c458b3c8d121797bc9aa1baf4e7e (patch)
treed572e7ef5654905072dd3a0e6017ec67785a4486 /net
parent[NETFILTER]: xt_hashlimit should use time_after_eq() (diff)
downloadkernel-qcow2-linux-98eb5683fb94c458b3c8d121797bc9aa1baf4e7e.tar.gz
kernel-qcow2-linux-98eb5683fb94c458b3c8d121797bc9aa1baf4e7e.tar.xz
kernel-qcow2-linux-98eb5683fb94c458b3c8d121797bc9aa1baf4e7e.zip
[TIPC]: Fix semaphore handling.
As noted by Kevin, tipc's release() does down_interruptible() and ignores the return value. So if signal_pending() we'll end up doing up() on a non-downed semaphore. Fix. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 6b792265dc06..24ddfd2ca38b 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -253,7 +253,7 @@ static int release(struct socket *sock)
dbg("sock_delete: %x\n",tsock);
if (!tsock)
return 0;
- down_interruptible(&tsock->sem);
+ down(&tsock->sem);
if (!sock->sk) {
up(&tsock->sem);
return 0;