From patchwork Mon May 10 20:24:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 52224 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 02104B7D66 for ; Tue, 11 May 2010 06:27:26 +1000 (EST) Received: from localhost ([127.0.0.1]:45821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBZZS-00030L-Ik for incoming@patchwork.ozlabs.org; Mon, 10 May 2010 16:27:22 -0400 Received: from [140.186.70.92] (port=38324 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBZSo-0008Qu-6l for qemu-devel@nongnu.org; Mon, 10 May 2010 16:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OBZSk-0000RL-2U for qemu-devel@nongnu.org; Mon, 10 May 2010 16:20:29 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:60337) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OBZSi-0000Qr-Gj for qemu-devel@nongnu.org; Mon, 10 May 2010 16:20:25 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e36.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4AKH92C024548 for ; Mon, 10 May 2010 14:17: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 o4AKKCRd076346 for ; Mon, 10 May 2010 14:20:14 -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 o4AKKBu6007608 for ; Mon, 10 May 2010 14:20:11 -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 o4AKK7BK007321; Mon, 10 May 2010 14:20:10 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Mon, 10 May 2010 13:24:02 -0700 Message-Id: <1273523044-26939-5-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1273523044-26939-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1273523044-26939-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 4/6] 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 | 45 +++++++++++++++++++-------------------------- hw/virtio-9p.c | 21 +++++++++++---------- 3 files changed, 31 insertions(+), 38 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index 1eceeb2..f87a35e 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -50,8 +50,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 8ed8c66..5589f72 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -144,33 +144,27 @@ 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; - } - - close(s); - return 0; + 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) { + goto err_end; + } + local_set_xattr(rpath(fs_ctx, path), credp); + if (err == -1) { + remove(rpath(fs_ctx, path)); + return err; + } + } else if (fs_ctx->fs_sm == sm_passthrough) { + local_set_cred(credp); + err = mknod(rpath(fs_ctx, path), credp->fc_mode, credp->fc_rdev); + } +err_end: + return err; } - static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp) { int err = -1; @@ -320,7 +314,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 9033541..bbeba7c 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) @@ -1812,13 +1813,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);