From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52742 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5DFP-0007no-EI for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5DFN-00073q-JL for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:28:54 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:55646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5DFM-00073C-Rw for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:28:53 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp06.in.ibm.com (8.14.4/8.13.1) with ESMTP id p2V8LgD5023821 for ; Thu, 31 Mar 2011 13:51:42 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2V8LgRM3412078 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 p2V8LfNl002892 for ; Thu, 31 Mar 2011 19:21:41 +1100 From: "M. Mohan Kumar" Date: Thu, 31 Mar 2011 13:51:38 +0530 Message-Id: <1301559700-6742-12-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 11/13] virtio-9p: Add support for chmod 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 chmod operation 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 | 5 +++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index 353aeed..dc92ea2 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -190,6 +190,21 @@ static int chroot_do_rename(V9fsFileObjectRequest *request) return 0; } +/* + * Change permissions of a file object + * Returns 0 on success and -errno on failure + */ +static int chroot_do_chmod(V9fsFileObjectRequest *request) +{ + int retval; + + retval = chmod(request->path.path, request->data.mode); + if (retval < 0) { + return -errno; + } + return 0; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -297,6 +312,9 @@ int v9fs_chroot(FsContext *fs_ctx) case T_RENAME: retval = chroot_do_rename(&request); break; + case T_CHMOD: + retval = chroot_do_chmod(&request); + break; default: retval = -1; break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 1fa1fde..8b89598 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -11,6 +11,7 @@ #define T_LINK 6 #define T_REMOVE 7 #define T_RENAME 8 +#define T_CHMOD 9 union MsgControl { struct cmsghdr cmsg; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 863bade..cf4e6ff 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -267,8 +267,9 @@ static int local_chmod(FsContext *fs_ctx, const char *path, FsCred *credp) { 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_CHMOD); + } else if (fs_ctx->fs_sm == SM_NONE) { return chmod(rpath(fs_ctx, path), credp->fc_mode); } return -1; -- 1.7.4