@@ -213,6 +213,21 @@ static int chroot_do_chmod(V9fsFileObjectRequest *request)
return 0;
}
+/*
+ * Change ownership of a file object
+ * Returns 0 on success and -errno on failure
+ */
+static int chroot_do_chown(V9fsFileObjectRequest *request)
+{
+ int retval;
+
+ retval = lchown(request->path.path, request->data.uid, request->data.gid);
+ if (retval < 0) {
+ return -errno;
+ }
+ return 0;
+}
+
static void chroot_daemonize(int chroot_sock)
{
sigset_t sigset;
@@ -325,6 +340,9 @@ int v9fs_chroot(FsContext *fs_ctx)
case T_CHMOD:
retval = chroot_do_chmod(&request);
break;
+ case T_CHOWN:
+ retval = chroot_do_chown(&request);
+ break;
default:
retval = -1;
break;
@@ -12,6 +12,7 @@
#define T_REMOVE 7
#define T_RENAME 8
#define T_CHMOD 9
+#define T_CHOWN 10
#define V9FS_FD_VALID INT_MAX
@@ -607,16 +607,17 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
char buffer[PATH_MAX];
char *path = fs_path->data;
- if ((credp->fc_uid == -1 && credp->fc_gid == -1) ||
- (fs_ctx->fs_sm == SM_PASSTHROUGH)) {
+ if (fs_ctx->fs_sm != SM_PASSTHROUGH &&
+ (credp->fc_uid == -1 && credp->fc_gid == -1)) {
return lchown(rpath(fs_ctx, path, buffer), credp->fc_uid,
credp->fc_gid);
} else if (fs_ctx->fs_sm == SM_MAPPED) {
return local_set_xattr(rpath(fs_ctx, path, buffer), credp);
- } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) ||
- (fs_ctx->fs_sm == SM_NONE)) {
+ } else if (fs_ctx->fs_sm == SM_NONE) {
return lchown(rpath(fs_ctx, path, buffer), credp->fc_uid,
credp->fc_gid);
+ } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) {
+ return passthrough_request(fs_ctx, NULL, path, 0, credp, T_CHOWN);
}
return -1;
}
Add support to do chown in chroot process Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> --- hw/9pfs/virtio-9p-chroot-worker.c | 18 ++++++++++++++++++ hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 9 +++++---- 3 files changed, 24 insertions(+), 4 deletions(-)