From patchwork Wed Mar 9 17:15:56 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: 86142 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 3CB38B6F2B for ; Thu, 10 Mar 2011 04:51:06 +1100 (EST) Received: from localhost ([127.0.0.1]:55274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxNB8-0001sE-Gx for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2011 12:28:06 -0500 Received: from [140.186.70.92] (port=58551 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxMzy-0005F6-96 for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxMzq-0005R1-Ue for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:31 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:37307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxMzp-0005QZ-UZ for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:16:26 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp02.in.ibm.com (8.14.4/8.13.1) with ESMTP id p29HGCNL016209 for ; Wed, 9 Mar 2011 22:46:12 +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 p29HGACN3358744 for ; Wed, 9 Mar 2011 22:46:11 +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 p29HG7jB020227 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 p29HG4wC020116; Wed, 9 Mar 2011 22:46:07 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Wed, 9 Mar 2011 22:45:56 +0530 Message-Id: <1299690960-12007-8-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.2 Cc: Subject: [Qemu-devel] [V8 PATCH 07/11] virtio-9p: Support for creating special files 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 and qemu side interfaces to create special files (directory, device nodes, links and symbolic links) Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-worker.c | 52 +++++++++++++++++++++++++++ hw/9pfs/virtio-9p-chroot.h | 5 +++ hw/9pfs/virtio-9p-local.c | 71 +++++++++++++++++++++---------------- 3 files changed, 97 insertions(+), 31 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index cdcb303..fcc0be1 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -115,6 +115,52 @@ unset_uid: return fd; } +/* + * Create directory, symbolic link, link, device node and regular files + * Similar to create, but it does not return the fd of created object + * Returns 0 as file descriptor on success and -errno on failure + */ +static int chroot_do_create_special(V9fsFileObjectRequest *request) +{ + int cur_uid, cur_gid; + int retval = -1; + + cur_uid = geteuid(); + cur_gid = getegid(); + + if (setfsuid(request->data.uid) < 0) { + return -errno; + } + if (setfsgid(request->data.gid) < 0) { + retval = -errno; + goto unset_uid; + } + + switch (request->data.type) { + case T_MKDIR: + retval = mkdir(request->path.path, request->data.mode); + break; + case T_SYMLINK: + retval = symlink(request->path.old_path, request->path.path); + break; + case T_LINK: + retval = link(request->path.old_path, request->path.path); + break; + default: + retval = mknod(request->path.path, request->data.mode, + request->data.dev); + break; + } + + if (retval < 0) { + retval = -errno; + } + setfsgid(cur_gid); +unset_uid: + setfsuid(cur_uid); + return retval; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -210,6 +256,12 @@ int v9fs_chroot(FsContext *fs_ctx) valid_fd = 1; } break; + case T_MKDIR: + case T_SYMLINK: + case T_LINK: + case T_MKNOD: + fd = chroot_do_create_special(&request); + break; default: fd = -1; break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 298d5b5..b2db276 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -4,6 +4,10 @@ /* types for V9fsFileObjectRequest */ #define T_OPEN 1 #define T_CREATE 2 +#define T_MKDIR 3 +#define T_MKNOD 4 +#define T_SYMLINK 5 +#define T_LINK 6 union MsgControl { struct cmsghdr cmsg; @@ -34,5 +38,6 @@ typedef struct V9fsFileObjectRequest int v9fs_chroot(FsContext *fs_ctx); int v9fs_request(FsContext *fs_ctx, V9fsFileObjectRequest *or); +int v9fs_create_special(FsContext *fs_ctx, V9fsFileObjectRequest *request); #endif /* _QEMU_VIRTIO_9P_CHROOT_H */ diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 625d29c..e7d39c0 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -287,8 +287,7 @@ static int local_mknod(FsContext *fs_ctx, const char *path, FsCred *credp) 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) { err = mknod(rpath(fs_ctx, path), credp->fc_mode, credp->fc_rdev); if (err == -1) { return err; @@ -298,6 +297,12 @@ static int local_mknod(FsContext *fs_ctx, const char *path, FsCred *credp) serrno = errno; goto err_end; } + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + err = passthrough_request(fs_ctx, NULL, path, 0, credp, T_MKNOD); + if (err < 0) { + serrno = errno; + goto err_end; + } } return err; @@ -324,8 +329,7 @@ static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp) 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) { err = mkdir(rpath(fs_ctx, path), credp->fc_mode); if (err == -1) { return err; @@ -335,6 +339,12 @@ static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp) serrno = errno; goto err_end; } + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + err = passthrough_request(fs_ctx, NULL, path, 0, credp, T_MKDIR); + if (err < 0) { + serrno = errno; + goto err_end; + } } return err; @@ -452,23 +462,19 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 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) { err = symlink(oldpath, rpath(fs_ctx, newpath)); if (err) { return err; } err = lchown(rpath(fs_ctx, newpath), credp->fc_uid, credp->fc_gid); - if (err == -1) { - /* - * If we fail to change ownership and if we are - * using security model none. Ignore the error - */ - if (fs_ctx->fs_sm != SM_NONE) { - serrno = errno; - goto err_end; - } else - err = 0; + err = 0; + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + err = passthrough_request(fs_ctx, oldpath, newpath, 0, credp, + T_SYMLINK); + if (err < 0) { + serrno = errno; + goto err_end; } } return err; @@ -479,24 +485,27 @@ err_end: return err; } -static int local_link(FsContext *ctx, const char *oldpath, const char *newpath) +static int local_link(FsContext *fs_ctx, const char *oldpath, + const char *newpath) { - char *tmp = qemu_strdup(rpath(ctx, oldpath)); int err, serrno = 0; - if (tmp == NULL) { - return -ENOMEM; - } - - err = link(tmp, rpath(ctx, newpath)); - if (err == -1) { - serrno = errno; - } - - qemu_free(tmp); - - if (err == -1) { - errno = serrno; + if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + err = passthrough_request(fs_ctx, oldpath, newpath, 0, NULL, + T_LINK); + if (err < 0) { + serrno = errno; + } + } else { + char *tmp = qemu_strdup(rpath(fs_ctx, oldpath)); + if (tmp == NULL) { + return -ENOMEM; + } + err = link(tmp, rpath(fs_ctx, newpath)); + if (err == -1) { + serrno = errno; + } + qemu_free(tmp); } return err;