From patchwork Wed Mar 9 17:15:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohan Kumar M X-Patchwork-Id: 86136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E0AD8B6ED0 for ; Thu, 10 Mar 2011 04:30:34 +1100 (EST) Received: from localhost ([127.0.0.1]:40923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxN5Q-0000IN-KZ for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2011 12:22:12 -0500 Received: from [140.186.70.92] (port=58489 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxMzp-00057r-JH for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxMzm-0005Pw-II for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:23 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:57779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxMzl-0005Oz-RT for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:22 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp03.in.ibm.com (8.14.4/8.13.1) with ESMTP id p29HGIob032040 for ; Wed, 9 Mar 2011 22:46:18 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p29HGHYA1957912 for ; Wed, 9 Mar 2011 22:46:17 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p29HG8lZ020255 for ; Wed, 9 Mar 2011 22:46:08 +0530 Received: from explorer.in.ibm.com ([9.124.208.3]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p29HG4wF020116; Wed, 9 Mar 2011 22:46:08 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Wed, 9 Mar 2011 22:45:59 +0530 Message-Id: <1299690960-12007-11-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1299690960-12007-1-git-send-email-mohan@in.ibm.com> References: <1299690960-12007-1-git-send-email-mohan@in.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 122.248.162.3 Cc: Subject: [Qemu-devel] [V8 PATCH 10/11] virtio-9p: Move file post creation changes to none security model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 cf4792b..1670e33 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -137,21 +137,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; } @@ -292,7 +285,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; @@ -334,7 +327,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; @@ -409,7 +402,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;