From patchwork Mon Feb 28 11:22:33 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: 84789 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 CCB26B70D8 for ; Mon, 28 Feb 2011 22:31:57 +1100 (EST) Received: from localhost ([127.0.0.1]:57712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pu1KU-0000Rk-W6 for incoming@patchwork.ozlabs.org; Mon, 28 Feb 2011 06:31:55 -0500 Received: from [140.186.70.92] (port=35573 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pu1Bp-0005Gm-NV for qemu-devel@nongnu.org; Mon, 28 Feb 2011 06:22:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pu1Bf-0007NI-6a for qemu-devel@nongnu.org; Mon, 28 Feb 2011 06:22:51 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:60186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pu1Be-0007Mz-Mo for qemu-devel@nongnu.org; Mon, 28 Feb 2011 06:22:47 -0500 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p1SBMjgu014949 for ; Mon, 28 Feb 2011 22:22:45 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1SBMjS12416756 for ; Mon, 28 Feb 2011 22:22:45 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1SBMiZ3032669 for ; Mon, 28 Feb 2011 22:22:45 +1100 Received: from explorer.in.ibm.com (K50wks273872wss.in.ibm.com [9.124.35.34]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1SBMcoF032551; Mon, 28 Feb 2011 22:22:44 +1100 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Mon, 28 Feb 2011 16:52:33 +0530 Message-Id: <1298892156-11667-7-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1298892156-11667-1-git-send-email-mohan@in.ibm.com> References: <1298892156-11667-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: 202.81.31.140 Cc: Subject: [Qemu-devel] [V6 PATCH 6/9] 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 deamon & qemu side interfaces to create regular files in chroot environment Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-dm.c | 39 +++++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-local.c | 21 +++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-dm.c b/hw/9pfs/virtio-9p-chroot-dm.c index c1d8c6e..985d42b 100644 --- a/hw/9pfs/virtio-9p-chroot-dm.c +++ b/hw/9pfs/virtio-9p-chroot-dm.c @@ -83,6 +83,42 @@ static void chroot_do_open(V9fsFileObjectRequest *request, FdInfo *fd_info) } } +/* + * Helper routine to create a file and return the file descriptor and + * error status in FdInfo structure. + */ +static void chroot_do_create(V9fsFileObjectRequest *request, FdInfo *fd_info) +{ + uid_t cur_uid; + gid_t cur_gid; + + cur_uid = geteuid(); + cur_gid = getegid(); + + fd_info->fi_fd = -1; + + if (setfsuid(request->data.uid) < 0) { + fd_info->fi_fd = -errno; + fd_info->fi_flags = FI_FD_INVALID; + return; + } + if (setfsgid(request->data.gid) < 0) { + fd_info->fi_fd = -errno; + fd_info->fi_flags = FI_FD_INVALID; + goto unset_uid; + } + + fd_info->fi_fd = open(request->path.path, request->data.flags, + request->data.mode); + if (fd_info->fi_fd < 0) { + fd_info->fi_fd = -errno; + fd_info->fi_flags = FI_FD_INVALID; + } + setfsgid(cur_gid); +unset_uid: + setfsuid(cur_uid); +} + static int chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -177,6 +213,9 @@ int v9fs_chroot(FsContext *fs_ctx) case T_OPEN: chroot_do_open(&request, &fd_info); break; + case T_CREATE: + chroot_do_create(&request, &fd_info); + break; default: fd_info.fi_flags = FI_FD_SOCKERR; break; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 0c55d35..3fed16c 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -58,6 +58,22 @@ static int passthrough_open(FsContext *fs_ctx, const char *path, int flags) return fd; } +static int passthrough_create(FsContext *fs_ctx, const char *path, int flags, + FsCred *credp) +{ + V9fsFileObjectRequest request; + int fd; + + fd = fill_fileobjectrequest(&request, path, credp); + if (fd < 0) { + return fd; + } + request.data.flags = flags; + request.data.type = T_CREATE; + fd = v9fs_request(fs_ctx, &request); + return fd; +} + static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) { int err; @@ -382,8 +398,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; @@ -393,6 +408,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_create(fs_ctx, path, flags, credp); } return fd;