From patchwork Fri Mar 4 09:25:52 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: 85384 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 7434AB70F2 for ; Fri, 4 Mar 2011 20:33:50 +1100 (EST) Received: from localhost ([127.0.0.1]:50576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvRON-0004m6-Ru for incoming@patchwork.ozlabs.org; Fri, 04 Mar 2011 04:33:47 -0500 Received: from [140.186.70.92] (port=53737 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvRH0-00022Z-1R for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvRGy-0003ej-Jj for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:09 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:39569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvRGx-0003eR-V1 for qemu-devel@nongnu.org; Fri, 04 Mar 2011 04:26:08 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id p249KWlY005713 for ; Fri, 4 Mar 2011 20:20:32 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p249Q6IO2465800 for ; Fri, 4 Mar 2011 20:26:06 +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 p249Q5F1023620 for ; Fri, 4 Mar 2011 20:26:06 +1100 Received: from explorer.in.ibm.com ([9.79.221.231]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p249PvTW023421; Fri, 4 Mar 2011 20:26:05 +1100 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Fri, 4 Mar 2011 14:55:52 +0530 Message-Id: <1299230756-1644-6-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1299230756-1644-1-git-send-email-mohan@in.ibm.com> References: <1299230756-1644-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.147 Cc: Subject: [Qemu-devel] [V7 PATCH 5/9] virtio-9p: Add support to open a file 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 This patch adds both chroot worker and qemu side support to open a file/ directory in the chroot environment Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot.c | 28 ++++++++++++++----- hw/9pfs/virtio-9p-chroot.h | 2 +- hw/9pfs/virtio-9p-local.c | 62 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 79 insertions(+), 13 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot.c b/hw/9pfs/virtio-9p-chroot.c index 4aa3b43..0c91db6 100644 --- a/hw/9pfs/virtio-9p-chroot.c +++ b/hw/9pfs/virtio-9p-chroot.c @@ -80,13 +80,25 @@ static int v9fs_write_request(int sockfd, V9fsFileObjectRequest *request) return 0; } -/* - * This patch adds v9fs_receivefd and v9fs_write_request functions, - * but there is no callers. To avoid compiler warning message, - * refer these two functions - */ -void chroot_dummy(void) +/* Return opened file descriptor on success or -errno on error */ +int v9fs_request(FsContext *fs_ctx, V9fsFileObjectRequest *request) { - (void)v9fs_receivefd; - (void)v9fs_write_request; + int fd, sock_error; + qemu_mutex_lock(&fs_ctx->chroot_mutex); + if (fs_ctx->chroot_ioerror) { + fd = -EIO; + goto unlock; + } + if (v9fs_write_request(fs_ctx->chroot_socket, request) < 0) { + fs_ctx->chroot_ioerror = 1; + fd = -EIO; + goto unlock; + } + fd = v9fs_receivefd(fs_ctx->chroot_socket, &sock_error); + if (fd < 0 && sock_error) { + fs_ctx->chroot_ioerror = 1; + } +unlock: + qemu_mutex_unlock(&fs_ctx->chroot_mutex); + return fd; } diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 0c020f8..6f676e9 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -39,6 +39,6 @@ typedef struct V9fsFileObjectRequest } V9fsFileObjectRequest; int v9fs_chroot(FsContext *fs_ctx); -void chroot_dummy(void); +int v9fs_request(FsContext *fs_ctx, V9fsFileObjectRequest *or); #endif /* _QEMU_VIRTIO_9P_CHROOT_H */ diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 0a015de..8c187d7 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -13,6 +13,9 @@ #include "virtio.h" #include "virtio-9p.h" #include "virtio-9p-xattr.h" +#include "qemu_socket.h" +#include "fsdev/qemu-fsdev.h" +#include "virtio-9p-chroot.h" #include #include #include @@ -20,6 +23,44 @@ #include #include +/* Helper routine to fill V9fsFileObjectRequest structure */ +static int fill_fileobjectrequest(V9fsFileObjectRequest *request, + const char *path, FsCred *credp) +{ + if (strlen(path) >= PATH_MAX) { + return -ENAMETOOLONG; + } + memset(request, 0, sizeof(*request)); + request->data.path_len = strlen(path); + strcpy(request->path.path, path); + if (credp) { + request->data.mode = credp->fc_mode; + request->data.uid = credp->fc_uid; + request->data.gid = credp->fc_gid; + request->data.dev = credp->fc_rdev; + } + return 0; +} + +static int passthrough_open(FsContext *fs_ctx, const char *path, int flags) +{ + V9fsFileObjectRequest request; + int fd; + + fd = fill_fileobjectrequest(&request, path, NULL); + if (fd < 0) { + errno = -fd; + return -1; + } + request.data.flags = flags; + request.data.type = T_OPEN; + fd = v9fs_request(fs_ctx, &request); + if (fd < 0) { + errno = -fd; + fd = -1; + } + return fd; +} static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) { @@ -138,14 +179,27 @@ static int local_closedir(FsContext *ctx, DIR *dir) return closedir(dir); } -static int local_open(FsContext *ctx, const char *path, int flags) +static int local_open(FsContext *fs_ctx, const char *path, int flags) { - return open(rpath(ctx, path), flags); + if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_open(fs_ctx, path, flags); + } else { + return open(rpath(fs_ctx, path), flags); + } } -static DIR *local_opendir(FsContext *ctx, const char *path) +static DIR *local_opendir(FsContext *fs_ctx, const char *path) { - return opendir(rpath(ctx, path)); + if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + int fd; + fd = passthrough_open(fs_ctx, path, O_DIRECTORY); + if (fd < 0) { + return NULL; + } + return fdopendir(fd); + } else { + return opendir(rpath(fs_ctx, path)); + } } static void local_rewinddir(FsContext *ctx, DIR *dir)