diff options
| author | Trond Myklebust | 2019-04-09 18:13:42 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2019-04-24 15:46:35 +0200 |
| commit | e45d1a1835b889676374fb74ff4d0e6b06ad173f (patch) | |
| tree | ccb99869e92ef128774ab5a9f2405d3e869a4a80 /fs/nfsd/nfs4xdr.c | |
| parent | SUNRPC: rsi_parse() should use the current user namespace (diff) | |
| download | kernel-qcow2-linux-e45d1a1835b889676374fb74ff4d0e6b06ad173f.tar.gz kernel-qcow2-linux-e45d1a1835b889676374fb74ff4d0e6b06ad173f.tar.xz kernel-qcow2-linux-e45d1a1835b889676374fb74ff4d0e6b06ad173f.zip | |
nfsd: knfsd must use the container user namespace
Convert knfsd to use the user namespace of the container that started
the server processes.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index a3a3455826aa..52c4f6daa649 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -521,6 +521,7 @@ nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access static __be32 nfsd4_decode_cb_sec(struct nfsd4_compoundargs *argp, struct nfsd4_cb_sec *cbs) { DECODE_HEAD; + struct user_namespace *userns = nfsd_user_namespace(argp->rqstp); u32 dummy, uid, gid; char *machine_name; int i; @@ -563,8 +564,8 @@ static __be32 nfsd4_decode_cb_sec(struct nfsd4_compoundargs *argp, struct nfsd4_ dummy = be32_to_cpup(p++); READ_BUF(dummy * 4); if (cbs->flavor == (u32)(-1)) { - kuid_t kuid = make_kuid(&init_user_ns, uid); - kgid_t kgid = make_kgid(&init_user_ns, gid); + kuid_t kuid = make_kuid(userns, uid); + kgid_t kgid = make_kgid(userns, gid); if (uid_valid(kuid) && gid_valid(kgid)) { cbs->uid = kuid; cbs->gid = kgid; |