From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58731 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pk8mT-0005Jw-Tu for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pk8mR-0006uV-JR for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:57 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:40600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pk8mR-0006uA-0r for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:55 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp06.au.ibm.com (8.14.4/8.13.1) with ESMTP id p115RmgD027882 for ; Tue, 1 Feb 2011 16:27:48 +1100 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p115RpJG1839266 for ; Tue, 1 Feb 2011 16:27:51 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p115RoZR007231 for ; Tue, 1 Feb 2011 16:27:50 +1100 Received: from explorer.in.ibm.com ([9.124.35.46]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p115RnfK007224 for ; Tue, 1 Feb 2011 16:27:50 +1100 From: "M. Mohan Kumar" Date: Tue, 1 Feb 2011 10:57:49 +0530 Message-Id: <1296538069-16824-1-git-send-email-mohan@in.ibm.com> In-Reply-To: <1296537693-16406-1-git-send-email-mohan@in.ibm.com> References: <1296537693-16406-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V4 PATCH 7/8] 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 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 c9ece6b..37a2510 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -208,21 +208,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; } @@ -363,7 +356,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; @@ -405,7 +398,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; @@ -480,7 +473,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