From f08a50bf637c1d7404051385963b4007f7e5e4c1 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Sun, 13 Jul 2008 12:14:04 -0700
Subject: [PATCH] --- yaml --- r: 98879 b: refs/heads/master c:
 ec229e830060091b9be63c8f873c1b2407a82821 h: refs/heads/master i:   98877:
 9dfb1be604d5ca34c3b212cd4ad480290cffe099   98875:
 0e271f3a9236d526ef44a82808f4fec9ea242cbd   98871:
 1ef0609602a11ad0d80a8cee2d6726dfd4bb8a7b   98863:
 0c320754b857a611180108d88782dfa2560d1d05   98847:
 dd3a509d2c58dd64d42b41c3c0fb27d9afa3211b   98815:
 e5ca9c2bfc780becf3f3f16590e52105bd0525e5 v: v3

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

diff --git a/[refs] b/[refs]
index 85ed5d1a6fa5..212732e0b43e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d213f806dad629e9af36fc45f082b87ed7bceb
+refs/heads/master: ec229e830060091b9be63c8f873c1b2407a82821
diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c
index 1e2e28afba45..ddd92cec78ed 100644
--- a/trunk/security/device_cgroup.c
+++ b/trunk/security/device_cgroup.c
@@ -300,7 +300,7 @@ static int may_access_whitelist(struct dev_cgroup *c,
 			continue;
 		if (whitem->minor != ~0 && whitem->minor != refwh->minor)
 			continue;
-		if (refwh->access & (~(whitem->access | ACC_MASK)))
+		if (refwh->access & (~whitem->access))
 			continue;
 		return 1;
 	}