---

yaml --- r: 45167 b: refs/heads/master c: 9883a13 h: refs/heads/master i: 45165: dbee60e 45163: 4f6e7ab 45159: 2b15587 45151: ad90f77 v: v3
git-mirror · Jan 2, 2007 · 23f580b · 23f580b
1 parent 56e91f6
commit 23f580b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;