aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-03-14 18:24:19 -0400
committerEric W. Biederman <ebiederm@xmission.com>2012-05-03 06:28:39 -0400
commit76b6db010297d4928ab7b7e7c78dd982f413f0a4 (patch)
tree0d8fef729548a4f266684c0b7e56e4a9ed14780f /ipc
parent078de5f706ece36afd73bb4b8283314132d2dfdf (diff)
userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgid
These function are no longer needed replace them with their more useful equivalents. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index b53cf3469d01..b6a0d46fbad7 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -538,8 +538,7 @@ static void __do_notify(struct mqueue_inode_info *info)
538 rcu_read_lock(); 538 rcu_read_lock();
539 sig_i.si_pid = task_tgid_nr_ns(current, 539 sig_i.si_pid = task_tgid_nr_ns(current,
540 ns_of_pid(info->notify_owner)); 540 ns_of_pid(info->notify_owner));
541 sig_i.si_uid = user_ns_map_uid(info->notify_user_ns, 541 sig_i.si_uid = from_kuid_munged(info->notify_user_ns, current_uid());
542 current_cred(), current_uid());
543 rcu_read_unlock(); 542 rcu_read_unlock();
544 543
545 kill_pid_info(info->notify.sigev_signo, 544 kill_pid_info(info->notify.sigev_signo,