From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1ex-0006zV-A4 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa1eu-0002RW-GX for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:38 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:42665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1et-0002QX-E6 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:36 -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 p5O8MTfC016448 for ; Fri, 24 Jun 2011 13:52:29 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5O8MTiw4309126 for ; Fri, 24 Jun 2011 13:52:29 +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 p5O8MSbV004223 for ; Fri, 24 Jun 2011 13:52:29 +0530 From: "M. Mohan Kumar" Date: Fri, 24 Jun 2011 13:52:19 +0530 Message-Id: <1308903744-2870-11-git-send-email-mohan@in.ibm.com> In-Reply-To: <1308903744-2870-1-git-send-email-mohan@in.ibm.com> References: <1308903744-2870-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V11 10/15] virtio-9p: Move file post creation changes to none security model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "M. Mohan Kumar" From: "M. Mohan Kumar" 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 | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 864a464..2645da0 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -152,23 +152,16 @@ static int local_set_xattr(const char *path, FsCred *credp) return 0; } -static int local_post_create_passthrough(FsContext *fs_ctx, const char *path, - FsCred *credp) +static int local_post_create_none(const char *path, FsCred *credp) { - char buffer[PATH_MAX]; + int retval; - if (chmod(rpath(fs_ctx, path, buffer), credp->fc_mode & 07777) < 0) { + if (chmod(path, credp->fc_mode & 07777) < 0) { return -1; } - if (lchown(rpath(fs_ctx, path, buffer), 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(path, credp->fc_uid, credp->fc_gid); + if (retval < 0) { + /* Ignore return value for none security model */ } return 0; } @@ -333,7 +326,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, if (err == -1) { goto out; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(buffer, credp); if (err == -1) { serrno = errno; goto err_end; @@ -381,7 +374,7 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, if (err == -1) { goto out; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(buffer, credp); if (err == -1) { serrno = errno; goto err_end; @@ -463,7 +456,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, err = fd; goto out; } - err = local_post_create_passthrough(fs_ctx, path, credp); + err = local_post_create_none(buffer, credp); if (err == -1) { serrno = errno; goto err_end; -- 1.7.5.4