From patchwork Tue Feb 1 05:27: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: 81280 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 34262B70FF for ; Tue, 1 Feb 2011 16:58:28 +1100 (EST) Received: from localhost ([127.0.0.1]:50094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pk8qb-0006sp-WE for incoming@patchwork.ozlabs.org; Tue, 01 Feb 2011 00:32:14 -0500 Received: from [140.186.70.92] (port=58570 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pk8m6-0005Bg-IB for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pk8m4-0006oY-C1 for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:33 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:60327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pk8m3-0006oS-LO for qemu-devel@nongnu.org; Tue, 01 Feb 2011 00:27:32 -0500 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp05.in.ibm.com (8.14.4/8.13.1) with ESMTP id p115RRHI028414 for ; Tue, 1 Feb 2011 10:57:27 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p115RRp82035830 for ; Tue, 1 Feb 2011 10:57:27 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p115RRuX013441 for ; Tue, 1 Feb 2011 16:27:27 +1100 Received: from explorer.in.ibm.com ([9.124.35.46]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p115RR68013438; Tue, 1 Feb 2011 16:27:27 +1100 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org Date: Tue, 1 Feb 2011 10:57:27 +0530 Message-Id: <1296538047-16758-1-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1296537693-16406-1-git-send-email-mohan@in.ibm.com> References: <1296537693-16406-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.5 Cc: stefanha@gmail.com Subject: [Qemu-devel] [V4 PATCH 5/8] 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 server & client side interfaces to create regular files in chroot environment Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot.c | 41 +++++++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-local.c | 22 ++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot.c b/hw/9pfs/virtio-9p-chroot.c index 7da0702..890dd78 100644 --- a/hw/9pfs/virtio-9p-chroot.c +++ b/hw/9pfs/virtio-9p-chroot.c @@ -227,6 +227,44 @@ 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_error = errno; + return; + } + if (setfsgid(request->data.gid) < 0) { + fd_info->fi_error = errno; + 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_error = errno; + } else { + fd_info->fi_error = 0; + fd_info->fi_flags = FI_FDVALID; + } + + setfsgid(cur_gid); +unset_uid: + setfsuid(cur_uid); +} + static int chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -324,6 +362,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_fd = 0; fd_info.fi_error = EIO; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 96e8181..afb088a 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -52,6 +52,23 @@ 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, error = 0; + + fill_request(&request, path, credp); + request.data.flags = flags; + request.data.type = T_CREATE; + fd = v9fs_request(fs_ctx, &request, &error); + if (fd < 0) { + errno = error; + } + qemu_free((void *)request.path.path); + return fd; +} + static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) { int err; @@ -376,8 +393,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; @@ -387,6 +403,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;