userns: Convert ipc to use kuid and kgid where appropriate

- Store the ipc owner and creator with a kuid
- Store the ipc group and the crators group with a kgid.
- Add error handling to ipc_update_perms, allowing it to
  fail if the uids and gids can not be converted to kuids
  or kgids.
- Modify the proc files to display the ipc creator and
  owner in the user namespace of the opener of the proc file.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 5215a81420df..58d31f1c1eb5 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1104,7 +1104,9 @@ static int semctl_down(struct ipc_namespace *ns, int semid,
                 freeary(ns, ipcp);
                 goto out_up;
         case IPC_SET:
-                ipc_update_perm(&semid64.sem_perm, ipcp);
+                err = ipc_update_perm(&semid64.sem_perm, ipcp);
+                if (err)
+                        goto out_unlock;
                 sma->sem_ctime = get_seconds();
                 break;
         default:
@@ -1677,6 +1679,7 @@ void exit_sem(struct task_struct *tsk)
 #ifdef CONFIG_PROC_FS
 static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
 {
+        struct user_namespace *user_ns = seq_user_ns(s);
         struct sem_array *sma = it;
 
         return seq_printf(s,
@@ -1685,10 +1688,10 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
                           sma->sem_perm.id,
                           sma->sem_perm.mode,
                           sma->sem_nsems,
-                          sma->sem_perm.uid,
-                          sma->sem_perm.gid,
-                          sma->sem_perm.cuid,
-                          sma->sem_perm.cgid,
+                          from_kuid_munged(user_ns, sma->sem_perm.uid),
+                          from_kgid_munged(user_ns, sma->sem_perm.gid),
+                          from_kuid_munged(user_ns, sma->sem_perm.cuid),
+                          from_kgid_munged(user_ns, sma->sem_perm.cgid),
                           sma->sem_otime,
                           sma->sem_ctime);
 }