In order to make the next patch more clear, expand may_access() logic.

Cc: Tejun Heo <t...@kernel.org>
Cc: Serge Hallyn <serge.hal...@canonical.com>
Signed-off-by: Aristeu Rozanski <a...@redhat.com>

---
 security/device_cgroup.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- github.orig/security/device_cgroup.c        2013-01-29 11:49:15.244665037 
-0500
+++ github/security/device_cgroup.c     2013-01-29 11:49:15.514669057 -0500
@@ -382,15 +382,18 @@           if (ex->minor != ~0 && ex->minor != re
 
        /*
         * In two cases we'll consider this new exception valid:
-        * - the dev cgroup has its default policy to allow + exception list:
-        *   the new exception should *not* match any of the exceptions
-        *   (behavior == DEVCG_DEFAULT_ALLOW, !match)
         * - the dev cgroup has its default policy to deny + exception list:
         *   the new exception *should* match the exceptions
-        *   (behavior == DEVCG_DEFAULT_DENY, match)
+        * - the dev cgroup has its default policy to allow + exception list:
+        *   the new exception should *not* match any of the exceptions
         */
-       if ((dev_cgroup->behavior == DEVCG_DEFAULT_DENY) == match)
-               return 1;
+       if (dev_cgroup->behavior == DEVCG_DEFAULT_DENY) {
+               if (match)
+                       return 1;
+       } else {
+               if (!match)
+                       return 1;
+       }
        return 0;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to