From f355d6b515e772228819beb46d00a8432ea640b6 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 11 Mar 2008 14:19:34 -0400
Subject: [PATCH] --- yaml --- r: 88447 b: refs/heads/master c:
 eda4f69ca5a532b425db5a6c2c6bc50717b9b5fe h: refs/heads/master i:   88445:
 07dd4215e56b614e6382ca0966b5ea9fd25a0986   88443:
 1d20deedcecbb1c5691fbc2f9e3893a245ebef56   88439:
 8565cb506e4c5d474c6d3227188f74bb258bbd1e   88431:
 e0c75f5768bbee1abc5cec1eb5b187ee729e72e8   88415:
 81dc615c5d10e177bd3e0c22a3913c9d0c65e210   88383:
 7b7ae7cfb3024803be81e951e6dbb2e29a48b613   88319:
 58c8bd05603de64c864dbbbb64502b80d5290f26 v: v3

---
 [refs]                       | 2 +-
 trunk/security/selinux/avc.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d522c3c992bd..1a7341a3d0e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0115e6c8980ea9125a17858291c90ecd990bc1c
+refs/heads/master: eda4f69ca5a532b425db5a6c2c6bc50717b9b5fe
diff --git a/trunk/security/selinux/avc.c b/trunk/security/selinux/avc.c
index 187964e88af1..cb3f0ce0b00a 100644
--- a/trunk/security/selinux/avc.c
+++ b/trunk/security/selinux/avc.c
@@ -871,6 +871,8 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid,
 	int rc = 0;
 	u32 denied;
 
+	BUG_ON(!requested);
+
 	rcu_read_lock();
 
 	node = avc_lookup(ssid, tsid, tclass, requested);
@@ -890,7 +892,7 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid,
 
 	denied = requested & ~(p_ae->avd.allowed);
 
-	if (!requested || denied) {
+	if (denied) {
 		if (selinux_enforcing || (flags & AVC_STRICT))
 			rc = -EACCES;
 		else