From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47857 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpgPo-0005FX-N0 for qemu-devel@nongnu.org; Wed, 16 Feb 2011 07:23:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PpgPn-0002A7-CN for qemu-devel@nongnu.org; Wed, 16 Feb 2011 07:23:28 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:34360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PpgPm-00025L-M2 for qemu-devel@nongnu.org; Wed, 16 Feb 2011 07:23:27 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp07.in.ibm.com (8.14.4/8.13.1) with ESMTP id p1GCNHd0014219 for ; Wed, 16 Feb 2011 17:53:17 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1GCNHl74472910 for ; Wed, 16 Feb 2011 17:53:17 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1GCNG46009609 for ; Wed, 16 Feb 2011 23:23:17 +1100 From: "M. Mohan Kumar" Date: Wed, 16 Feb 2011 17:53:14 +0530 Message-Id: <1297858995-24676-8-git-send-email-mohan@in.ibm.com> In-Reply-To: <1297858995-24676-1-git-send-email-mohan@in.ibm.com> References: <1297858995-24676-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V5 PATCH 7/8] 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 , "Daniel P. Berrange" , blauwirbel@gmail.com After creating a file object, its permission and ownership details are updated as per 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 9975ed1..9d2d31c 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -169,21 +169,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; } @@ -324,7 +317,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; @@ -366,7 +359,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; @@ -441,7 +434,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