From patchwork Wed May 26 23:21:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 53667 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 30F29B7D12 for ; Thu, 27 May 2010 09:20:06 +1000 (EST) Received: from localhost ([127.0.0.1]:59989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHPtK-0003Xi-DT for incoming@patchwork.ozlabs.org; Wed, 26 May 2010 19:20:02 -0400 Received: from [140.186.70.92] (port=51752 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHPrg-0003Sj-7w for qemu-devel@nongnu.org; Wed, 26 May 2010 19:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHPrf-0006kO-3N for qemu-devel@nongnu.org; Wed, 26 May 2010 19:18:20 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:41525) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHPre-0006kH-PE for qemu-devel@nongnu.org; Wed, 26 May 2010 19:18:19 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e37.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4QNGZWk003893 for ; Wed, 26 May 2010 17:16:35 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o4QNIFtl117086 for ; Wed, 26 May 2010 17:18:15 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o4QNIFLE017095 for ; Wed, 26 May 2010 17:18:15 -0600 Received: from localhost.localdomain (elm9m80.beaverton.ibm.com [9.47.81.80]) by d03av02.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o4QNI069016065; Wed, 26 May 2010 17:18:13 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Wed, 26 May 2010 16:21:46 -0700 Message-Id: <1274916106-25616-8-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1274916106-25616-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1274916106-25616-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" Subject: [Qemu-devel] [PATCH -V4 7/7] virtio-9p: Implemented security model for chown and chgrp. 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 Signed-off-by: Venkateswararao Jujjuri --- hw/file-op-9p.h | 4 ++-- hw/virtio-9p-local.c | 18 ++++++++++++++---- hw/virtio-9p.c | 15 ++++++++++++--- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index c1c08b4..877faf2 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -49,8 +49,8 @@ typedef struct FileOperations { int (*lstat)(FsContext *, const char *, struct stat *); ssize_t (*readlink)(FsContext *, const char *, char *, size_t); - int (*chmod)(FsContext *, const char *, mode_t); - int (*chown)(FsContext *, const char *, uid_t, gid_t); + int (*chmod)(FsContext *, const char *, FsCred *); + int (*chown)(FsContext *, const char *, FsCred *); int (*mknod)(FsContext *, const char *, FsCred *); int (*utime)(FsContext *, const char *, const struct utimbuf *); int (*remove)(FsContext *, const char *); diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 11f3650..f46acac 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -173,9 +173,14 @@ static ssize_t local_writev(FsContext *ctx, int fd, const struct iovec *iov, return writev(fd, iov, iovcnt); } -static int local_chmod(FsContext *ctx, const char *path, mode_t mode) +static int local_chmod(FsContext *fs_ctx, const char *path, FsCred *credp) { - return chmod(rpath(ctx, path), mode); + if (fs_ctx->fs_sm == SM_MAPPED) { + return local_set_xattr(rpath(fs_ctx, path), credp); + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + return chmod(rpath(fs_ctx, path), credp->fc_mode); + } + return -1; } static int local_mknod(FsContext *fs_ctx, const char *path, FsCred *credp) @@ -436,9 +441,14 @@ static int local_rename(FsContext *ctx, const char *oldpath, } -static int local_chown(FsContext *ctx, const char *path, uid_t uid, gid_t gid) +static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp) { - return chown(rpath(ctx, path), uid, gid); + if (fs_ctx->fs_sm == SM_MAPPED) { + return local_set_xattr(rpath(fs_ctx, path), credp); + } else if (fs_ctx->fs_sm == SM_PASSTHROUGH) { + return chown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid); + } + return -1; } static int local_utime(FsContext *ctx, const char *path, diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 90620aa..dceb5fc 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -154,7 +154,11 @@ static int v9fs_do_writev(V9fsState *s, int fd, const struct iovec *iov, static int v9fs_do_chmod(V9fsState *s, V9fsString *path, mode_t mode) { - return s->ops->chmod(&s->ctx, path->data, mode); + FsCred cred; + cred_init(&cred); + cred.fc_mode = mode; + + return s->ops->chmod(&s->ctx, path->data, &cred); } static int v9fs_do_mknod(V9fsState *s, V9fsCreateState *vs, mode_t mode, @@ -231,7 +235,12 @@ static int v9fs_do_rename(V9fsState *s, V9fsString *oldpath, static int v9fs_do_chown(V9fsState *s, V9fsString *path, uid_t uid, gid_t gid) { - return s->ops->chown(&s->ctx, path->data, uid, gid); + FsCred cred; + cred_init(&cred); + cred.fc_uid = uid; + cred.fc_gid = gid; + + return s->ops->chown(&s->ctx, path->data, &cred); } static int v9fs_do_utime(V9fsState *s, V9fsString *path, @@ -2022,7 +2031,7 @@ static void v9fs_wstat_post_utime(V9fsState *s, V9fsWstatState *vs, int err) goto out; } - if (vs->v9stat.n_gid != -1) { + if (vs->v9stat.n_gid != -1 || vs->v9stat.n_uid != -1) { if (v9fs_do_chown(s, &vs->fidp->path, vs->v9stat.n_uid, vs->v9stat.n_gid)) { err = -errno;