Add both chroot worker & qemu side interfaces to create regular files in chroot environment
Signed-off-by: M. Mohan Kumar <mo...@in.ibm.com> --- hw/9pfs/virtio-9p-chroot-worker.c | 36 ++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-local.c | 26 ++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index e7bc6c2..cdcb303 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -85,6 +85,36 @@ static int chroot_do_open(V9fsFileObjectRequest *request) return fd; } +/* + * Helper routine to create a file and return the file descriptor + */ +static int chroot_do_create(V9fsFileObjectRequest *request) +{ + uid_t cur_uid; + gid_t cur_gid; + int fd = -1; + + cur_uid = geteuid(); + cur_gid = getegid(); + + if (setfsuid(request->data.uid) < 0) { + return -errno; + } + if (setfsgid(request->data.gid) < 0) { + fd = -errno; + goto unset_uid; + } + + fd = open(request->path.path, request->data.flags, request->data.mode); + if (fd < 0) { + fd = -errno; + } + setfsgid(cur_gid); +unset_uid: + setfsuid(cur_uid); + return fd; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -174,6 +204,12 @@ int v9fs_chroot(FsContext *fs_ctx) valid_fd = 1; } break; + case T_CREATE: + fd = chroot_do_create(&request); + if (fd >= 0) { + valid_fd = 1; + } + break; default: fd = -1; break; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 8c187d7..aa8ebff 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -62,6 +62,27 @@ static int passthrough_open(FsContext *fs_ctx, const char *path, int flags) return fd; } +static int passthrough_create(FsContext *fs_ctx, const char *path, int flags, + FsCred *credp) +{ + V9fsFileObjectRequest request; + int fd; + + fd = fill_fileobjectrequest(&request, path, credp); + if (fd < 0) { + errno = -1; + return -1; + } + request.data.flags = flags; + request.data.type = T_CREATE; + fd = v9fs_request(fs_ctx, &request); + if (fd < 0) { + errno = -fd; + fd = -1; + } + return fd; +} + static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) { int err; @@ -386,8 +407,7 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, serrno = errno; goto err_end; } - } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) || - (fs_ctx->fs_sm == SM_NONE)) { + } else if (fs_ctx->fs_sm == SM_NONE) { fd = open(rpath(fs_ctx, path), flags, credp->fc_mode); if (fd == -1) { return fd; @@ -397,6 +417,8 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, serrno = errno; goto err_end; } + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + fd = passthrough_create(fs_ctx, path, flags, credp); } return fd; -- 1.7.3.4