lkml.org 
[lkml]   [2012]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 32/43] userns: signal remove unnecessary map_cred_ns
    Quoting Eric W. Beiderman (ebiederm@xmission.com):
    > From: Eric W. Biederman <ebiederm@xmission.com>
    >
    > map_cred_ns is a light wrapper around from_kuid with the order of the arguments
    > reversed. Replace map_cred_ns with from_kuid and remove map_cred_ns.
    >
    > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

    Acked-by: Serge Hallyn <serge.hallyn@canonical.com>

    > ---
    > kernel/signal.c | 20 +++++---------------
    > 1 files changed, 5 insertions(+), 15 deletions(-)
    >
    > diff --git a/kernel/signal.c b/kernel/signal.c
    > index 9797939..6aca310 100644
    > --- a/kernel/signal.c
    > +++ b/kernel/signal.c
    > @@ -1019,15 +1019,6 @@ static inline int legacy_queue(struct sigpending *signals, int sig)
    > return (sig < SIGRTMIN) && sigismember(&signals->signal, sig);
    > }
    >
    > -/*
    > - * map the uid in struct cred into user namespace *ns
    > - */
    > -static inline uid_t map_cred_ns(const struct cred *cred,
    > - struct user_namespace *ns)
    > -{
    > - return from_kuid_munged(ns, cred->uid);
    > -}
    > -
    > #ifdef CONFIG_USER_NS
    > static inline void userns_fixup_signal_uid(struct siginfo *info, struct task_struct *t)
    > {
    > @@ -1677,8 +1668,8 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
    > */
    > rcu_read_lock();
    > info.si_pid = task_pid_nr_ns(tsk, tsk->parent->nsproxy->pid_ns);
    > - info.si_uid = map_cred_ns(__task_cred(tsk),
    > - task_cred_xxx(tsk->parent, user_ns));
    > + info.si_uid = from_kuid_munged(task_cred_xxx(tsk->parent, user_ns),
    > + task_uid(tsk));
    > rcu_read_unlock();
    >
    > info.si_utime = cputime_to_clock_t(tsk->utime + tsk->signal->utime);
    > @@ -1761,8 +1752,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk,
    > */
    > rcu_read_lock();
    > info.si_pid = task_pid_nr_ns(tsk, parent->nsproxy->pid_ns);
    > - info.si_uid = map_cred_ns(__task_cred(tsk),
    > - task_cred_xxx(parent, user_ns));
    > + info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns), task_uid(tsk));
    > rcu_read_unlock();
    >
    > info.si_utime = cputime_to_clock_t(tsk->utime);
    > @@ -2180,8 +2170,8 @@ static int ptrace_signal(int signr, siginfo_t *info,
    > info->si_code = SI_USER;
    > rcu_read_lock();
    > info->si_pid = task_pid_vnr(current->parent);
    > - info->si_uid = map_cred_ns(__task_cred(current->parent),
    > - current_user_ns());
    > + info->si_uid = from_kuid_munged(current_user_ns(),
    > + task_uid(current->parent));
    > rcu_read_unlock();
    > }
    >
    > --
    > 1.7.2.5
    >
    > _______________________________________________
    > Containers mailing list
    > Containers@lists.linux-foundation.org
    > https://lists.linuxfoundation.org/mailman/listinfo/containers


    \
     
     \ /
      Last update: 2012-04-18 22:37    [W:0.025 / U:63.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site