From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsk-0005bh-Oz for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0bsi-0005EQ-VC for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:46 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:38595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsi-0005DT-DQ for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:44 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp05.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85GIe9b001953 for ; Mon, 5 Sep 2011 21:48:40 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85GIerA3760214 for ; Mon, 5 Sep 2011 21:48:40 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p85GIdoU029227 for ; Tue, 6 Sep 2011 02:18:40 +1000 From: "M. Mohan Kumar" Date: Mon, 5 Sep 2011 21:48:33 +0530 Message-Id: <1315239516-4451-13-git-send-email-mohan@in.ibm.com> In-Reply-To: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> References: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [PATCH V12 12/15] hw/9pfs: chown in chroot environment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori , Stefan Hajnoczi Add support to do chown in chroot process Signed-off-by: M. Mohan Kumar --- 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(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index d297b50..8ca4805 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -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; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index fc7a134..07c6627 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -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 diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 50e55ed..673cd44 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -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; } -- 1.7.6