pid namespaces: changes to show virtual ids to user

This is the largest patch in the set. Make all (I hope) the places where
the pid is shown to or get from user operate on the virtual pids.

The idea is:
 - all in-kernel data structures must store either struct pid itself
   or the pid's global nr, obtained with pid_nr() call;
 - when seeking the task from kernel code with the stored id one
   should use find_task_by_pid() call that works with global pids;
 - when showing pid's numerical value to the user the virtual one
   should be used, but however when one shows task's pid outside this
   task's namespace the global one is to be used;
 - when getting the pid from userspace one need to consider this as
   the virtual one and use appropriate task/pid-searching functions.

[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: nuther build fix]
[akpm@linux-foundation.org: yet nuther build fix]
[akpm@linux-foundation.org: remove unneeded casts]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 15 insertions, 12 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 20f1fed8fa48..c0b26dc4617b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -29,6 +29,8 @@
 #include <linux/audit.h>
 #include <linux/signal.h>
 #include <linux/mutex.h>
+#include <linux/nsproxy.h>
+#include <linux/pid.h>
 
 #include <net/sock.h>
 #include "util.h"
@@ -330,7 +332,8 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
                         (info->notify_owner &&
                          info->notify.sigev_notify == SIGEV_SIGNAL) ?
                                 info->notify.sigev_signo : 0,
-                        pid_nr(info->notify_owner));
+                        pid_nr_ns(info->notify_owner,
+                                current->nsproxy->pid_ns));
         spin_unlock(&info->lock);
         buffer[sizeof(buffer)-1] = '\0';
         slen = strlen(buffer)+1;
@@ -507,7 +510,7 @@ static void __do_notify(struct mqueue_inode_info *info)
                         sig_i.si_errno = 0;
                         sig_i.si_code = SI_MESGQ;
                         sig_i.si_value = info->notify.sigev_value;
-                        sig_i.si_pid = current->tgid;
+                        sig_i.si_pid = task_pid_vnr(current);
                         sig_i.si_uid = current->uid;
 
                         kill_pid_info(info->notify.sigev_signo,
diff --git a/ipc/msg.c b/ipc/msg.c
index a03fcb522fff..319468609b76 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -611,7 +611,7 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg)
                                 msr->r_msg = ERR_PTR(-E2BIG);
                         } else {
                                 msr->r_msg = NULL;
-                                msq->q_lrpid = msr->r_tsk->pid;
+                                msq->q_lrpid = task_pid_vnr(msr->r_tsk);
                                 msq->q_rtime = get_seconds();
                                 wake_up_process(msr->r_tsk);
                                 smp_mb();
@@ -695,7 +695,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
                 }
         }
 
-        msq->q_lspid = current->tgid;
+        msq->q_lspid = task_tgid_vnr(current);
         msq->q_stime = get_seconds();
 
         if (!pipelined_send(msq, msg)) {
@@ -810,7 +810,7 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
                         list_del(&msg->m_list);
                         msq->q_qnum--;
                         msq->q_rtime = get_seconds();
-                        msq->q_lrpid = current->tgid;
+                        msq->q_lrpid = task_tgid_vnr(current);
                         msq->q_cbytes -= msg->m_ts;
                         atomic_sub(msg->m_ts, &msg_bytes);
                         atomic_dec(&msg_hdrs);
diff --git a/ipc/sem.c b/ipc/sem.c
index b676fef6d208..64ff4261f4e2 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -795,7 +795,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 for (un = sma->undo; un; un = un->id_next)
                         un->semadj[semnum] = 0;
                 curr->semval = val;
-                curr->sempid = current->tgid;
+                curr->sempid = task_tgid_vnr(current);
                 sma->sem_ctime = get_seconds();
                 /* maybe some queued-up processes were waiting for this */
                 update_queue(sma);
@@ -1196,7 +1196,7 @@ retry_undos:
         if (error)
                 goto out_unlock_free;
 
-        error = try_atomic_semop (sma, sops, nsops, un, current->tgid);
+        error = try_atomic_semop (sma, sops, nsops, un, task_tgid_vnr(current));
         if (error <= 0) {
                 if (alter && error == 0)
                         update_queue (sma);
@@ -1211,7 +1211,7 @@ retry_undos:
         queue.sops = sops;
         queue.nsops = nsops;
         queue.undo = un;
-        queue.pid = current->tgid;
+        queue.pid = task_tgid_vnr(current);
         queue.id = semid;
         queue.alter = alter;
         if (alter)
@@ -1382,7 +1382,7 @@ found:
                                         semaphore->semval = 0;
                                 if (semaphore->semval > SEMVMX)
                                         semaphore->semval = SEMVMX;
-                                semaphore->sempid = current->tgid;
+                                semaphore->sempid = task_tgid_vnr(current);
                         }
                 }
                 sma->sem_otime = get_seconds();
diff --git a/ipc/shm.c b/ipc/shm.c
index 5fc5cf50cf1b..b9d272900a1e 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -168,7 +168,7 @@ static void shm_open(struct vm_area_struct *vma)
         shp = shm_lock(sfd->ns, sfd->id);
         BUG_ON(!shp);
         shp->shm_atim = get_seconds();
-        shp->shm_lprid = current->tgid;
+        shp->shm_lprid = task_tgid_vnr(current);
         shp->shm_nattch++;
         shm_unlock(shp);
 }
@@ -213,7 +213,7 @@ static void shm_close(struct vm_area_struct *vma)
         /* remove from the list of attaches of the shm segment */
         shp = shm_lock(ns, sfd->id);
         BUG_ON(!shp);
-        shp->shm_lprid = current->tgid;
+        shp->shm_lprid = task_tgid_vnr(current);
         shp->shm_dtim = get_seconds();
         shp->shm_nattch--;
         if(shp->shm_nattch == 0 &&
@@ -392,7 +392,7 @@ static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
         if(id == -1) 
                 goto no_id;
 
-        shp->shm_cprid = current->tgid;
+        shp->shm_cprid = task_tgid_vnr(current);
         shp->shm_lprid = 0;
         shp->shm_atim = shp->shm_dtim = 0;
         shp->shm_ctim = get_seconds();