lkml.org 
[lkml]   [2013]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 4/9] devcg: expand may_access() logic
    In order to make the next patch more clear, expand may_access() logic.

    v2: may_access() returns bool now

    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Serge Hallyn <serge.hallyn@canonical.com>
    Signed-off-by: Aristeu Rozanski <aris@redhat.com>

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

    --- github.orig/security/device_cgroup.c 2013-01-30 08:56:29.532063723 -0500
    +++ github/security/device_cgroup.c 2013-01-30 08:58:02.934460404 -0500
    @@ -355,8 +355,8 @@ return 0;
    * @dev_cgroup: dev cgroup to be tested against
    * @refex: new exception
    */
    -static int may_access(struct dev_cgroup *dev_cgroup,
    - struct dev_exception_item *refex)
    +static bool may_access(struct dev_cgroup *dev_cgroup,
    + struct dev_exception_item *refex)
    {
    struct dev_exception_item *ex;
    bool match = false;
    @@ -382,16 +382,19 @@ 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;
    - return 0;
    + if (dev_cgroup->behavior == DEVCG_DEFAULT_DENY) {
    + if (match)
    + return true;
    + } else {
    + if (!match)
    + return true;
    + }
    + return false;
    }

    /*


    \
     
     \ /
      Last update: 2013-01-30 19:01    [W:4.317 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site