NFS User Namespaces
Subsystems (3)
v2 cover NFS User Namespaces
This patchset adds some functionality to allow NFS to be used from NFS namespaces (containers).
Changes since v1:
* Added samples
Sargun Dhillon (3):
NFS: Use cred from fscontext during fsmount samples/vfs: Split out common code for new syscall APIs samples/vfs: Add example leveraging NFS with new APIs and user
namespaces
fs/nfs/client.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/nfs4client.c | 2 +- samples/vfs/.gitignore | 2 + samples/vfs/Makefile | 5 +- samples/vfs/test-fsmount.c | 86 +----------- samples/vfs/test-nfs-userns.c | 181 +++++++++++++++++++++++++ samples/vfs/vfs-helper.c | 43 ++++++ samples/vfs/vfs-helper.h | 55 ++++++++ 9 files changed, 289 insertions(+), 88 deletions(-) create mode 100644 samples/vfs/test-nfs-userns.c create mode 100644 samples/vfs/vfs-helper.c create mode 100644 samples/vfs/vfs-helper.h
Signature · 1 line
2.25.1
PATCH v2 1/3 NFS: Use cred from fscontext during fsmount
In several patches, support was introduced to NFS for user namespaces:
ccfe51a5161c: SUNRPC: Fix the server AUTH_UNIX userspace mappingse6667c73a27d: SUNRPC: rsi_parse() should use the current user namespace 1a58e8a0e5c1: NFS: Store the credential of the mount process in the nfs_server 283ebe3ec415: SUNRPC: Use the client user namespace when encoding credsac83228a7101: SUNRPC: Use namespace of listening daemon in the client AUTH_GSS upcall 264d948ce7d0: NFS: Convert NFSv3 to use the container user namespace 58002399da65: NFSv4: Convert the NFS client idmapper to use the container user namespacec207db2f5da5: NFS: Convert NFSv2 to use the container user namespace 3b7eb5e35d0f: NFS: When mounting, don't share filesystems between different user namespaces
All of these commits are predicated on the NFS server being created with credentials that are in the user namespace of interest. The new VFS mount APIs help in this[1], in that the creation of the FSFD (fsopen) captures a set of credentials at creation time.
Normally, the new file system API users automatically get their super block's user_ns set to the fc->user_ns in sget_fc, but since NFS has to do special manipulation of UIDs / GIDs on the wire, it keeps track of credentials itself.
Unfortunately, the credentials that the NFS uses are the current_creds at the time FSCONFIG_CMD_CREATE is called. When FSCONFIG_CMD_CREATE is called, simultaneously, mount_capable is checked -- which checks if the user has CAP_SYS_ADMIN in the init_user_ns because NFS does not have FS_USERNS_MOUNT.
This makes a subtle change so that the struct cred from fsopen is used instead. Since the fs_context is available at server creation time, and it has the credentials, we can just use those.
This roughly allows a privileged user to mount on behalf of an unprivileged usernamespace, by forking off and calling fsopen in the unprivileged user namespace. It can then pass back that fsfd to the privileged process which can configure the NFS mount, and then it can call FSCONFIG_CMD_CREATE before switching back into the mount namespace of the container, and finish up the mounting process and call fsmount and move_mount.
This change makes a small user space change if the user performs this elaborate process of passing around file descriptors, and switching namespaces. There may be a better way to go about this, or even enable FS_USERNS_MOUNT on NFS, but this seems like the safest and most straightforward approach.
--- fs/nfs/client.c | 2 +- fs/nfs/nfs4client.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfs/client.c +1 -1
@@ -967,7 +967,7 @@ struct nfs_server *nfs_create_server(struct fs_context *fc)if (!server)return ERR_PTR (-ENOMEM ); - server->cred =get_cred (current_cred ()); + server->cred =get_cred (fc->cred); error = -ENOMEM ; fattr =nfs_alloc_fattr ();
fs/nfs/nfs4client.c +1 -1
@@ -1120,7 +1120,7 @@ struct nfs_server *nfs4_create_server(struct fs_context *fc)if (!server)return ERR_PTR (-ENOMEM ); - server->cred =get_cred (current_cred ()); + server->cred =get_cred (fc->cred); auth_probe = ctx->auth_info.flavor_len <1 ;
Signature · 1 line
2.25.1
PATCH v2 2/3 samples/vfs: Split out common code for new syscall APIs
In reply to Sargun DhillonThere are a bunch of helper functions which make using the new mount APIs much easier. As we add examples of leveraging the new APIs, it probably makes sense to promote code reuse.
--- samples/vfs/Makefile | 2 + samples/vfs/test-fsmount.c | 86 +------------------------------------- samples/vfs/vfs-helper.c | 43 +++++++++++++++++++ samples/vfs/vfs-helper.h | 55 ++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 85 deletions(-) create mode 100644 samples/vfs/vfs-helper.c create mode 100644 samples/vfs/vfs-helper.h
samples/vfs/Makefile +2 -0
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +test-fsmount-objs := test-fsmount.o vfs-helper.o userprogs := test-fsmount test-statx + always-y := $(userprogs) userccflags += -I usr/include
samples/vfs/test-fsmount.c +1 -85
92 lines not on this page · raw message
samples/vfs/vfs-helper.c new file +43 -0
44 lines not on this page · raw message
samples/vfs/vfs-helper.h new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 3/3 samples/vfs: Add example leveraging NFS with new APIs and user namespaces
In reply to Sargun DhillonThis adds an example which assumes you already have an NFS server setup, but does the work of creating a user namespace, and an NFS mount from that user namespace which then exposes different UIDs than that of the init user namespace.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + samples/vfs/.gitignore | 2 + samples/vfs/Makefile | 3 +- samples/vfs/test-nfs-userns.c | 181 +++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 samples/vfs/test-nfs-userns.c
fs/nfs/flexfilelayout/flexfilelayout.c +1 -0
@@ -361,6 +361,7 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh, struct nfs4_layoutget_res *lgr, gfp_t gfp_flags) { +struct user_namespace *user_ns = lh->plh_lc_cred->user_ns;struct pnfs_layout_segment *ret;struct nfs4_ff_layout_segment *fls =NULL ;struct xdr_stream stream;
samples/vfs/.gitignore +2 -0
@@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only test-fsmount test-statx +test-nfs-userns +
samples/vfs/Makefile +2 -1
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only test-fsmount-objs := test-fsmount.o vfs-helper.o -userprogs := test-fsmount test-statx +test-nfs-userns-objs := test-nfs-userns.o vfs-helper.o +userprogs := test-fsmount test-statx test-nfs-userns always-y := $(userprogs)
samples/vfs/test-nfs-userns.c new file +181 -0
181 lines not on this page · raw message
Signature · 1 line
2.25.1