From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43582 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5D8Z-0003A4-Si for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:21:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5D8X-000522-SS for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:21:51 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:39346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5D8X-0004zY-2O for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:21:49 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp07.in.ibm.com (8.14.4/8.13.1) with ESMTP id p2V8LgID015407 for ; Thu, 31 Mar 2011 13:51:42 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2V8LgDV2498674 for ; Thu, 31 Mar 2011 13:51:42 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2V8Lf2T002901 for ; Thu, 31 Mar 2011 19:21:41 +1100 From: "M. Mohan Kumar" Date: Thu, 31 Mar 2011 13:51:39 +0530 Message-Id: <1301559700-6742-13-git-send-email-mohan@in.ibm.com> In-Reply-To: <1301559700-6742-1-git-send-email-mohan@in.ibm.com> References: <1301559700-6742-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V10 PATCH 12/13] virtio-9p: Add support for chown List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, 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 dc92ea2..7893d40 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -205,6 +205,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; @@ -315,6 +330,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 8b89598..001297a 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 union MsgControl { struct cmsghdr cmsg; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index cf4e6ff..def0c62 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -528,13 +528,14 @@ static int local_rename(FsContext *ctx, const char *oldpath, static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp) { - 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), credp->fc_uid, credp->fc_gid); } else if (fs_ctx->fs_sm == SM_MAPPED) { return local_set_xattr(rpath(fs_ctx, path), credp); - } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) || - (fs_ctx->fs_sm == SM_NONE)) { + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(fs_ctx, NULL, path, 0, credp, T_CHOWN); + } else if (fs_ctx->fs_sm == SM_NONE) { return lchown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid); } return -1; -- 1.7.4