From patchwork Mon Sep 5 16:18:27 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: 113404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8CB59B6F7E for ; Tue, 6 Sep 2011 02:42:06 +1000 (EST) Received: from localhost ([::1]:35424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0btT-0007Ut-8x for incoming@patchwork.ozlabs.org; Mon, 05 Sep 2011 12:19:31 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsp-0005iG-CM for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0bsj-0005EX-0k for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:51 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:51950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsi-0005DC-F8 for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:44 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp02.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85GIdkG004243 for ; Mon, 5 Sep 2011 21:48:39 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85GIdW54194442 for ; Mon, 5 Sep 2011 21:48:39 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p85GIcj5029170 for ; Tue, 6 Sep 2011 02:18:39 +1000 Received: from explorer.in.ibm.com ([9.79.187.208]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p85GIbFr029092; Tue, 6 Sep 2011 02:18:38 +1000 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Anthony Liguori , Stefan Hajnoczi Date: Mon, 5 Sep 2011 21:48:27 +0530 Message-Id: <1315239516-4451-7-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> References: <1315239516-4451-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.2 Subject: [Qemu-devel] [PATCH V12 06/15] hw/9pfs: Create support in chroot environment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add both chroot worker & qemu side interfaces to create regular files in chroot environment Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-worker.c | 36 ++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 5 +++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index 40a54b3..581bfa9 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -93,6 +93,36 @@ static int chroot_do_open(V9fsFileObjectRequest *request) return fd; } +/* + * Helper routine to create a file and return the file descriptor + */ +static int chroot_do_create(V9fsFileObjectRequest *request) +{ + uid_t cur_uid; + gid_t cur_gid; + int fd = -1; + + cur_uid = geteuid(); + cur_gid = getegid(); + + if (setfsuid(request->data.uid) < 0) { + return -errno; + } + if (setfsgid(request->data.gid) < 0) { + fd = -errno; + goto unset_uid; + } + + fd = open(request->path.path, request->data.flags, request->data.mode); + if (fd < 0) { + fd = -errno; + } + setfsgid(cur_gid); +unset_uid: + setfsuid(cur_uid); + return fd; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -184,6 +214,12 @@ int v9fs_chroot(FsContext *fs_ctx) valid_fd = 1; } break; + case T_CREATE: + retval = chroot_do_create(&request); + if (retval >= 0) { + valid_fd = 1; + } + break; default: retval = -1; break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 326238d..d5c3f37 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -4,6 +4,7 @@ #include "qemu_socket.h" /* types for V9fsFileObjectRequest */ #define T_OPEN 1 +#define T_CREATE 2 #define V9FS_FD_VALID INT_MAX diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index a91adb8..4e40fa8 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -474,8 +474,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, serrno = errno; goto err_end; } - } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) || - (fs_ctx->fs_sm == SM_NONE)) { + } else if (fs_ctx->fs_sm == SM_NONE) { fd = open(rpath(fs_ctx, path, buffer), flags, credp->fc_mode); if (fd == -1) { err = fd; @@ -486,6 +485,8 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, serrno = errno; goto err_end; } + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + fd = passthrough_request(fs_ctx, NULL, path, flags, credp, T_CREATE); } err = fd; fs->fd = fd;