From patchwork Mon Jun 14 20:34:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 55586 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 2083FB7D86 for ; Tue, 15 Jun 2010 06:40:26 +1000 (EST) Received: from localhost ([127.0.0.1]:44718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOGSE-0004Od-To for incoming@patchwork.ozlabs.org; Mon, 14 Jun 2010 16:40:23 -0400 Received: from [140.186.70.92] (port=57808 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOGJf-0000CY-Mt for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOGJe-00043l-C8 for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:31:31 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:41842) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOGJe-00043b-6y for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:31:30 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5EKS9VG012652 for ; Mon, 14 Jun 2010 14:28:09 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5EKVCI7090822 for ; Mon, 14 Jun 2010 14:31:12 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5EKV8oM012459 for ; Mon, 14 Jun 2010 14:31:08 -0600 Received: from localhost.localdomain (elm9m80.beaverton.ibm.com [9.47.81.80]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5EKV5F9012202; Mon, 14 Jun 2010 14:31:07 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Mon, 14 Jun 2010 13:34:42 -0700 Message-Id: <1276547689-3408-4-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1276547689-3408-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1276547689-3408-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-V7 03/10] virtio-9p: Security model for chmod 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 | 2 +- hw/virtio-9p-local.c | 11 +++++++---- hw/virtio-9p.c | 5 ++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index 307bd1e..1c8d89b 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -49,7 +49,7 @@ 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 (*chmod)(FsContext *, const char *, FsCred *); int (*chown)(FsContext *, const char *, uid_t, gid_t); int (*mknod)(FsContext *, const char *, mode_t, dev_t); int (*mksock)(FsContext *, const char *); diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 056b4ba..9bdcf02 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -129,9 +129,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 *ctx, const char *path, mode_t mode, dev_t dev) @@ -253,8 +258,6 @@ static int local_remove(FsContext *ctx, const char *path) static int local_fsync(FsContext *ctx, int fd) { - if (0) /* Just to supress the warning. Will be removed in next patch. */ - (void)local_set_xattr(NULL, NULL); return fsync(fd); } diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index a7ba4b6..24291f4 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -154,7 +154,10 @@ 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, V9fsString *path, mode_t mode, dev_t dev)