From 23f580b5e2ccf521c1c0a8b8ec85408641902e21 Mon Sep 17 00:00:00 2001
From: Parag Warudkar <paragw@paragw.zapto.org>
Date: Tue, 2 Jan 2007 21:09:31 +0100
Subject: [PATCH] --- yaml --- r: 45167 b: refs/heads/master c:
 9883a13c72dbf8c518814b6091019643cdb34429 h: refs/heads/master i:   45165:
 dbee60e8a32f2a8c1872069cd0c9ee4865d6fbe0   45163:
 4f6e7ab3329d28fcff815b3f0b20e3a0fa9906e6   45159:
 2b155874838fbcecbd7ead117d59aa52d9886e41   45151:
 ad90f7701f3834070e37d0d203a1a846eb42d28a v: v3

---
 [refs]                               | 2 +-
 trunk/security/selinux/ss/services.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d76e4af5ad31..afd40fc8a2c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec8acb6904fabb8e741f741ec99bb1c18f2b3dee
+refs/heads/master: 9883a13c72dbf8c518814b6091019643cdb34429
diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c
index bdb7070dd3dc..ee0581557966 100644
--- a/trunk/security/selinux/ss/services.c
+++ b/trunk/security/selinux/ss/services.c
@@ -2660,9 +2660,11 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask)
 		rcu_read_unlock();
 		return 0;
 	}
-	lock_sock(sock->sk);
+	local_bh_disable();
+	bh_lock_sock_nested(sock->sk);
 	rc = selinux_netlbl_socket_setsid(sock, sksec->sid);
-	release_sock(sock->sk);
+	bh_unlock_sock(sock->sk);
+	local_bh_enable();
 	rcu_read_unlock();
 
 	return rc;