From: Andrew Morton <akpm@osdl.org>
Date: Fri, 28 Oct 2005 22:12:02 +0000 (-0700)
Subject: [ROSE]: rose_heartbeat_expiry() locking fix
X-Git-Tag: v2.6.15-rc1~18^2~31^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3d7a9d77533d7516a8cfb8e2b612cd5ead4fa59;p=linux-2.6-omap-h63xx.git

[ROSE]: rose_heartbeat_expiry() locking fix

Missing unlock, as noted by Ted Unangst <tedu@coverity.com>.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
---

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 50ae0371dab..b6c8f38cc26 100644
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -138,6 +138,7 @@ static void rose_heartbeat_expiry(unsigned long param)
 		   is accepted() it isn't 'dead' so doesn't get removed. */
 		if (sock_flag(sk, SOCK_DESTROY) ||
 		    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
+			bh_unlock_sock(sk);
 			rose_destroy_socket(sk);
 			return;
 		}