From patchwork Wed Mar 9 17:15:55 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: 86137 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 886F3B6F2B for ; Thu, 10 Mar 2011 04:36:03 +1100 (EST) Received: from localhost ([127.0.0.1]:47039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxNIm-0005HZ-5z for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2011 12:36:00 -0500 Received: from [140.186.70.92] (port=47649 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxN9N-0001la-BK for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:26:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxN0O-0005a9-PC for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:04 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:55695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxN0O-0005Ze-38 for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:00 -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 p29HGrOL010734 for ; Wed, 9 Mar 2011 22:46:53 +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 p29HGqET3907608 for ; Wed, 9 Mar 2011 22:46:53 +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 p29HG7OC020210 for ; Wed, 9 Mar 2011 22:46:07 +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 p29HG4wB020116; Wed, 9 Mar 2011 22:46:06 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Wed, 9 Mar 2011 22:45:55 +0530 Message-Id: <1299690960-12007-7-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.7 Cc: Subject: [Qemu-devel] [V8 PATCH 06/11] virtio-9p: Create support in chroot environment 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 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 e7bc6c2..cdcb303 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -85,6 +85,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; @@ -174,6 +204,12 @@ int v9fs_chroot(FsContext *fs_ctx) valid_fd = 1; } break; + case T_CREATE: + fd = chroot_do_create(&request); + if (fd >= 0) { + valid_fd = 1; + } + break; default: fd = -1; break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index ceb858d..298d5b5 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -3,6 +3,7 @@ /* types for V9fsFileObjectRequest */ #define T_OPEN 1 +#define T_CREATE 2 union MsgControl { struct cmsghdr cmsg; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 9ba1644..625d29c 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -394,8 +394,7 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, 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), flags, credp->fc_mode); if (fd == -1) { return fd; @@ -405,6 +404,8 @@ static int local_open2(FsContext *fs_ctx, const char *path, int flags, serrno = errno; goto err_end; } + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + fd = passthrough_request(fs_ctx, NULL, path, flags, credp, T_CREATE); } return fd;