commit 43dff98b022ded593e73c3784bac03bc9fc7ec55
author Shaun Pereira <spereira@tusc.com.au> Fri Apr 28 12:00:17 2006 -0700
committer David S. Miller <davem@sunset.davemloft.net> Sat Apr 29 18:33:11 2006 -0700
tree 93fc4549e1c5d2eee1186916ff8507ce63a99b63
parent e0a515bc6a2188f02916e976f419a8640312e32a

[X25]: fix for spinlock recurse and spinlock lockup with timer handler

When the sk_timer function x25_heartbeat_expiry() is called by the
kernel in a running/terminating process, spinlock-recursion and
spinlock-lockup locks up the kernel.  This has happened with testing
on some distro's and the patch below fixed it.

Signed-off-by: Shaun Pereira <spereira@tusc.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/x25/x25_timer.c

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 0a92e1d..71ff308 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -114,8 +114,9 @@
 			if (sock_flag(sk, SOCK_DESTROY) ||
 			    (sk->sk_state == TCP_LISTEN &&
 			     sock_flag(sk, SOCK_DEAD))) {
+				bh_unlock_sock(sk);
 				x25_destroy_socket(sk);
-				goto unlock;
+				return;
 			}
 			break;
 
@@ -128,7 +129,6 @@
 	}
 restart_heartbeat:
 	x25_start_heartbeat(sk);
-unlock:
 	bh_unlock_sock(sk);
 }