From patchwork Fri May 21 21:26:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 53208 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 41435B7D24 for ; Sat, 22 May 2010 07:26:22 +1000 (EST) Received: from localhost ([127.0.0.1]:52465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFZjX-0007w6-4A for incoming@patchwork.ozlabs.org; Fri, 21 May 2010 17:26:19 -0400 Received: from [140.186.70.92] (port=44939 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFZft-0006ZF-EV for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFZfr-0001LD-4b for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:33 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:57935) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFZfq-0001Kq-VJ for qemu-devel@nongnu.org; Fri, 21 May 2010 17:22:31 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4LLKlmX014305 for ; Fri, 21 May 2010 15:20:47 -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 o4LLMSac253430 for ; Fri, 21 May 2010 15:22:28 -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 o4LLMRcw018366 for ; Fri, 21 May 2010 15:22:27 -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 o4LLMN2g018050; Fri, 21 May 2010 15:22:26 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Fri, 21 May 2010 14:26:07 -0700 Message-Id: <1274477170-7658-5-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 4/7] virtio-9p: Implement Security model for mknod related 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 In the mapped security model all the special files are created as regular files on the fileserver and appropriate mode bits are added to the extended attributes. These extended attributes are used to present this file as special file to the client. Signed-off-by: Venkateswararao Jujjuri --- hw/file-op-9p.h | 3 +- hw/virtio-9p-local.c | 53 +++++++++++++++++++++++++++---------------------- hw/virtio-9p.c | 21 ++++++++++--------- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index 2cf7d27..752fbad 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -51,8 +51,7 @@ typedef struct FileOperations 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 (*mknod)(FsContext *, const char *, mode_t, dev_t); - int (*mksock)(FsContext *, const char *); + int (*mknod)(FsContext *, const char *, FsCred *); int (*utime)(FsContext *, const char *, const struct utimbuf *); int (*remove)(FsContext *, const char *); int (*symlink)(FsContext *, const char *, const char *); diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 14fd3d9..bfcd695 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -134,33 +134,39 @@ static int local_chmod(FsContext *ctx, const char *path, mode_t mode) return chmod(rpath(ctx, path), mode); } -static int local_mknod(FsContext *ctx, const char *path, mode_t mode, dev_t dev) +static int local_mknod(FsContext *fs_ctx, const char *path, FsCred *credp) { - return mknod(rpath(ctx, path), mode, dev); -} - -static int local_mksock(FsContext *ctx2, const char *path) -{ - struct sockaddr_un addr; - int s; - - addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, 108, "%s", rpath(ctx2, path)); - - s = socket(PF_UNIX, SOCK_STREAM, 0); - if (s == -1) { - return -1; - } - - if (bind(s, (struct sockaddr *)&addr, sizeof(addr))) { - close(s); - return -1; + int err = -1; + /* Determine the security model */ + if (fs_ctx->fs_sm == sm_mapped) { + err = mknod(rpath(fs_ctx, path), SM_LOCAL_MODE_BITS|S_IFREG, 0); + if (err == -1) { + return err; + } + local_set_xattr(rpath(fs_ctx, path), credp); + if (err == -1) { + goto err_end; + } + } else if (fs_ctx->fs_sm == sm_passthrough) { + err = mknod(rpath(fs_ctx, path), credp->fc_mode, credp->fc_rdev); + if (err == -1) { + return err; + } + err = chmod(rpath(fs_ctx, path), credp->fc_mode & 07777); + if (err == -1) { + goto err_end; + } + err = chown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid); + if (err == -1) { + goto err_end; + } } + return err; - close(s); - return 0; +err_end: + remove(rpath(fs_ctx, path)); + return err; } - static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp) { int err = -1; @@ -341,7 +347,6 @@ FileOperations local_ops = { .writev = local_writev, .chmod = local_chmod, .mknod = local_mknod, - .mksock = local_mksock, .mkdir = local_mkdir, .fstat = local_fstat, .open2 = local_open2, diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index c8bd5da..30f649d 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -157,14 +157,15 @@ static int v9fs_do_chmod(V9fsState *s, V9fsString *path, mode_t mode) return s->ops->chmod(&s->ctx, path->data, mode); } -static int v9fs_do_mknod(V9fsState *s, V9fsString *path, mode_t mode, dev_t dev) +static int v9fs_do_mknod(V9fsState *s, V9fsCreateState *vs, mode_t mode, + dev_t dev) { - return s->ops->mknod(&s->ctx, path->data, mode, dev); -} - -static int v9fs_do_mksock(V9fsState *s, V9fsString *path) -{ - return s->ops->mksock(&s->ctx, path->data); + FsCred cred; + cred_init(&cred); + cred.fc_uid = vs->fidp->uid; + cred.fc_mode = mode; + cred.fc_rdev = dev; + return s->ops->mknod(&s->ctx, vs->fullname.data, &cred); } static int v9fs_do_mkdir(V9fsState *s, V9fsCreateState *vs) @@ -1816,13 +1817,13 @@ static void v9fs_create_post_lstat(V9fsState *s, V9fsCreateState *vs, int err) } nmode |= vs->perm & 0777; - err = v9fs_do_mknod(s, &vs->fullname, nmode, makedev(major, minor)); + err = v9fs_do_mknod(s, vs, nmode, makedev(major, minor)); v9fs_create_post_perms(s, vs, err); } else if (vs->perm & P9_STAT_MODE_NAMED_PIPE) { - err = v9fs_do_mknod(s, &vs->fullname, S_IFIFO | (vs->mode & 0777), 0); + err = v9fs_do_mknod(s, vs, S_IFIFO | (vs->perm & 0777), 0); v9fs_post_create(s, vs, err); } else if (vs->perm & P9_STAT_MODE_SOCKET) { - err = v9fs_do_mksock(s, &vs->fullname); + err = v9fs_do_mknod(s, vs, S_IFSOCK | (vs->perm & 0777), 0); v9fs_create_post_mksock(s, vs, err); } else { vs->fidp->fd = v9fs_do_open2(s, vs);