From patchwork Fri May 21 21:26:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 53207 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 DCA2DB7D2E for ; Sat, 22 May 2010 07:24:11 +1000 (EST) Received: from localhost ([127.0.0.1]:50535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFZhO-0006fA-7M for incoming@patchwork.ozlabs.org; Fri, 21 May 2010 17:24:06 -0400 Received: from [140.186.70.92] (port=44963 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFZfw-0006bV-Nf for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFZft-0001Li-H1 for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:36 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:34296) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFZft-0001LW-Bc for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:33 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e33.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4LLIOha018871 for ; Fri, 21 May 2010 15:18:24 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id o4LLMUk4143228 for ; Fri, 21 May 2010 15:22:30 -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 o4LLMT8o018499 for ; Fri, 21 May 2010 15:22:30 -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 o4LLMN2j018050; Fri, 21 May 2010 15:22:28 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Fri, 21 May 2010 14:26:10 -0700 Message-Id: <1274477170-7658-8-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1274477170-7658-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1274477170-7658-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 -V3 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 0a9c10a..b3a320c 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 283ed5d..c5678ae 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) @@ -415,9 +420,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 fbc846b..a9dfc0d 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, @@ -2038,7 +2047,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;