aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/upcall.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2013-01-30 22:21:14 -0500
committerEric W. Biederman <ebiederm@xmission.com>2013-02-13 09:00:53 -0500
commitd83f5901bc0cd7131a3b8534169ee889efc4c257 (patch)
treeec47947fcec33d9d373367d86b787b08be997168 /fs/coda/upcall.c
parent9fd973e085f7759f710603422b2e11ad5f2e000d (diff)
coda: Restrict coda messages to the initial user namespace
Remove the slight chance that uids and gids in coda messages will be interpreted in the wrong user namespace. - Only allow processes in the initial user namespace to open the coda character device to communicate with coda filesystems. - Explicitly convert the uids in the coda header into the initial user namespace. - In coda_vattr_to_attr make kuids and kgids from the initial user namespace uids and gids in struct coda_vattr that just came from userspace. - In coda_iattr_to_vattr convert kuids and kgids into uids and gids in the intial user namespace and store them in struct coda_vattr for sending to coda userspace programs. Nothing needs to be changed with mounts as coda does not support being mounted in anything other than the initial user namespace. Cc: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/coda/upcall.c')
-rw-r--r--fs/coda/upcall.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 5c6d2cd6ee86..3a731976dc5e 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -52,7 +52,7 @@ static void *alloc_upcall(int opcode, int size)
52 inp->ih.opcode = opcode; 52 inp->ih.opcode = opcode;
53 inp->ih.pid = task_pid_nr_ns(current, &init_pid_ns); 53 inp->ih.pid = task_pid_nr_ns(current, &init_pid_ns);
54 inp->ih.pgid = task_pgrp_nr_ns(current, &init_pid_ns); 54 inp->ih.pgid = task_pgrp_nr_ns(current, &init_pid_ns);
55 inp->ih.uid = current_fsuid(); 55 inp->ih.uid = from_kuid(&init_user_ns, current_fsuid());
56 56
57 return (void*)inp; 57 return (void*)inp;
58} 58}
@@ -157,7 +157,7 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
157} 157}
158 158
159int venus_close(struct super_block *sb, struct CodaFid *fid, int flags, 159int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
160 vuid_t uid) 160 kuid_t uid)
161{ 161{
162 union inputArgs *inp; 162 union inputArgs *inp;
163 union outputArgs *outp; 163 union outputArgs *outp;
@@ -166,7 +166,7 @@ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
166 insize = SIZE(release); 166 insize = SIZE(release);
167 UPARG(CODA_CLOSE); 167 UPARG(CODA_CLOSE);
168 168
169 inp->ih.uid = uid; 169 inp->ih.uid = from_kuid(&init_user_ns, uid);
170 inp->coda_close.VFid = *fid; 170 inp->coda_close.VFid = *fid;
171 inp->coda_close.flags = flags; 171 inp->coda_close.flags = flags;
172 172