From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53793 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvRH5-000268-K2 for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvRH3-0003fo-4r for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:15 -0500 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:52345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvRH2-0003fW-KL for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:13 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id p249L4uw025071 for ; Fri, 4 Mar 2011 20:21:04 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p249QBqX2416710 for ; Fri, 4 Mar 2011 20:26:11 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p249QA6O023735 for ; Fri, 4 Mar 2011 20:26:11 +1100 From: "M. Mohan Kumar" Date: Fri, 4 Mar 2011 14:55:55 +0530 Message-Id: <1299230756-1644-9-git-send-email-mohan@in.ibm.com> In-Reply-To: <1299230756-1644-1-git-send-email-mohan@in.ibm.com> References: <1299230756-1644-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V7 PATCH 8/9] virtio-9p: Move file post creation changes to none security model List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Stefan Hajnoczi After creating a file object, its permission and ownership details are updated as per 9p client's request for both passthrough and none security model. But with chrooted environment its not required for passthrough security model. Move all post file creation changes to none security model. Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-local.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 904ee71..864334d 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -176,21 +176,14 @@ static int local_set_xattr(const char *path, FsCred *credp) return 0; } -static int local_post_create_passthrough(FsContext *fs_ctx, const char *path, +static int local_post_create_none(FsContext *fs_ctx, const char *path, FsCred *credp) { + int retval; if (chmod(rpath(fs_ctx, path), credp->fc_mode & 07777) < 0) { return -1; } - if (lchown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid) < 0) { - /* - * If we fail to change ownership and if we are - * using security model none. Ignore the error - */ - if (fs_ctx->fs_sm != SM_NONE) { - return -1; - } - } + retval = lchown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid); return 0; } @@ -331,7 +324,7 @@ static int local_mknod(FsContext *fs_ctx, const char *path, FsCred *credp) if (err == -1) { return err; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(fs_ctx, path, credp); if (err == -1) { serrno = errno; goto err_end; @@ -373,7 +366,7 @@ static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp) if (err == -1) { return err; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(fs_ctx, path, credp); if (err == -1) { serrno = errno; goto err_end; @@ -448,7 +441,7 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, if (fd == -1) { return fd; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(fs_ctx, path, credp); if (err == -1) { serrno = errno; goto err_end; -- 1.7.3.4