From: [email protected]
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 <[email protected]>
diff -uprN -X dontdiff linux-2.6.17-rc2-vanilla/net/x25/x25_timer.c linux-2.6.17-rc2/net/x25/x25_timer.c
--- linux-2.6.17-rc2-vanilla/net/x25/x25_timer.c 2006-04-20 12:00:03.000000000 +1000
+++ linux-2.6.17-rc2/net/x25/x25_timer.c 2006-04-20 12:02:43.000000000 +1000
@@ -114,8 +114,9 @@ static void x25_heartbeat_expiry(unsigne
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 @@ static void x25_heartbeat_expiry(unsigne
}
restart_heartbeat:
x25_start_heartbeat(sk);
-unlock:
bh_unlock_sock(sk);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
