lkml.org 
[lkml]   [2012]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 43/43] userns: Convert the move_pages, and migrate_pages permission checks to use uid_eq
    From: Eric W. Biederman <ebiederm@xmission.com>

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    mm/mempolicy.c | 4 ++--
    mm/migrate.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/mm/mempolicy.c b/mm/mempolicy.c
    index cfb6c86..7b44fc8 100644
    --- a/mm/mempolicy.c
    +++ b/mm/mempolicy.c
    @@ -1334,8 +1334,8 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
    * userid as the target process.
    */
    tcred = __task_cred(task);
    - if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
    - cred->uid != tcred->suid && cred->uid != tcred->uid &&
    + if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
    + !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
    !capable(CAP_SYS_NICE)) {
    rcu_read_unlock();
    err = -EPERM;
    diff --git a/mm/migrate.c b/mm/migrate.c
    index 51c08a0..1cf5252 100644
    --- a/mm/migrate.c
    +++ b/mm/migrate.c
    @@ -1371,8 +1371,8 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
    * userid as the target process.
    */
    tcred = __task_cred(task);
    - if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
    - cred->uid != tcred->suid && cred->uid != tcred->uid &&
    + if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
    + !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
    !capable(CAP_SYS_NICE)) {
    rcu_read_unlock();
    err = -EPERM;
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-04-08 07:17    [W:0.023 / U:93.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site