From patchwork Mon Sep 5 16:18:35 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: 113408 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 36119B6F7C for ; Tue, 6 Sep 2011 03:09:29 +1000 (EST) Received: from localhost ([::1]:35464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0btY-0007WP-Jb for incoming@patchwork.ozlabs.org; Mon, 05 Sep 2011 12:19:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsk-0005bg-E4 for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0bsi-0005EB-Ek for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:46 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:50919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsh-0005Di-Qz for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:44 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp04.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85GIfmJ014971 for ; Mon, 5 Sep 2011 21:48:41 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85GIeif2986036 for ; Mon, 5 Sep 2011 21:48:40 +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 p85GIeId029245 for ; Tue, 6 Sep 2011 02:18:40 +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 p85GIbG1029092; Tue, 6 Sep 2011 02:18:40 +1000 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Anthony Liguori , Stefan Hajnoczi Date: Mon, 5 Sep 2011 21:48:35 +0530 Message-Id: <1315239516-4451-15-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.4 Subject: [Qemu-devel] [PATCH V12 14/15] hw/9pfs: readlink 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 Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-worker.c | 17 ++++++++++++++--- hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 14 ++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index a2f6dcd..3040d98 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -367,9 +367,6 @@ int v9fs_chroot(FsContext *fs_ctx) case T_CHOWN: retval = chroot_do_chown(&request); break; - default: - retval = -1; - break; case T_LSTAT: buff = g_malloc(request.data.size); retval = lstat(request.path.path, (struct stat *)buff); @@ -377,6 +374,19 @@ int v9fs_chroot(FsContext *fs_ctx) retval = -errno; } break; + case T_READLINK: + buff = g_malloc(request.data.size); + retval = readlink(request.path.path, buff, request.data.size); + if (retval < 0) { + retval = -errno; + } else { + buff[retval] = '\0'; + retval = 0; + } + break; + default: + retval = -1; + break; } /* Send the results */ @@ -394,6 +404,7 @@ int v9fs_chroot(FsContext *fs_ctx) chroot_sendfd(chroot_sock, retval, valid_fd); break; case T_LSTAT: + case T_READLINK: chroot_sendspecial(chroot_sock, buff, request.data.size, retval); g_free(buff); break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 9ed3f4d..ebf04b5 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -14,6 +14,7 @@ #define T_CHMOD 9 #define T_CHOWN 10 #define T_LSTAT 11 +#define T_READLINK 12 #define V9FS_FD_VALID INT_MAX diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 13c93a5..ffef8a2 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -99,6 +99,12 @@ static int passthrough_special_request(FsContext *fs_ctx, const char *path, request.data.size = size; if (type == T_LSTAT) { retval = v9fs_special(fs_ctx, &request, buff, size); + } else if (type == T_READLINK) { + retval = v9fs_special(fs_ctx, &request, buff, size); + /* readlink needs to return the number of bytes placed in buff */ + if (retval >= 0) { + retval = strlen(buff); + } } else { return -1; } @@ -206,6 +212,11 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, char buffer[PATH_MAX]; char *path = fs_path->data; + if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_special_request(fs_ctx, path, buf, bufsz, + T_READLINK); + } + if (fs_ctx->fs_sm == SM_MAPPED) { int fd; fd = open(rpath(fs_ctx, path, buffer), O_RDONLY); @@ -217,8 +228,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, } while (tsize == -1 && errno == EINTR); close(fd); return tsize; - } else if ((fs_ctx->fs_sm == SM_PASSTHROUGH) || - (fs_ctx->fs_sm == SM_NONE)) { + } else if (fs_ctx->fs_sm == SM_NONE) { tsize = readlink(rpath(fs_ctx, path, buffer), buf, bufsz); } return tsize;