[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH-V2 4/7] virtio-9p: Implement Security model for mkno
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [PATCH-V2 4/7] virtio-9p: Implement Security model for mknod related files |
Date: |
Tue, 11 May 2010 18:18:40 -0700 |
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 <address@hidden>
---
hw/file-op-9p.h | 3 +--
hw/virtio-9p-local.c | 46 ++++++++++++++++++++--------------------------
hw/virtio-9p.c | 21 +++++++++++----------
3 files changed, 32 insertions(+), 38 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 466b2d5..5d3d99c 100644
--- a/hw/virtio-9p-local.c
+++ b/hw/virtio-9p-local.c
@@ -134,33 +134,28 @@ 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) {
+ err = mknod(rpath(fs_ctx, path), credp->fc_mode, credp->fc_rdev);
+ chmod(rpath(fs_ctx, path), credp->fc_mode & 07777);
+ chown(rpath(fs_ctx, path), credp->fc_uid, credp->fc_gid);
+ }
+err_end:
+ return err;
}
-
static int local_mkdir(FsContext *fs_ctx, const char *path, FsCred *credp)
{
int err = -1;
@@ -317,7 +312,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);
--
1.6.5.2
- [Qemu-devel] [PATCH-V2 0/7] virtio-9p:Introducing security model for VirtFS, Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 2/7] virtio-9p: Rearrange fileop structures, Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 1/7] virtio-9p: Introduces an option to specify the security model., Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 6/7] virtio-9p: Implemented Security model for lstat and fstat, Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 3/7] virtio-9p: modify create/open2 and mkdir for new security model., Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 4/7] virtio-9p: Implement Security model for mknod related files,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [PATCH-V2 5/7] virtio-9p: Implemented security model for symlink and link., Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 7/7] virtio-9p: Implemented security model for chown and chgrp., Venkateswararao Jujjuri (JV), 2010/05/11
- [Qemu-devel] [PATCH-V2 0/7] virtio-9p:Introducing security model for VirtFS, Venkateswararao Jujjuri (JV), 2010/05/21
- [Qemu-devel] [PATCH -V3 4/7] virtio-9p: Implement Security model for mknod related files, Venkateswararao Jujjuri (JV), 2010/05/21
- [Qemu-devel] [PATCH -V3 5/7] virtio-9p: Implemented security model for symlink and link., Venkateswararao Jujjuri (JV), 2010/05/21
- [Qemu-devel] [PATCH -V3 7/7] virtio-9p: Implemented security model for chown and chgrp., Venkateswararao Jujjuri (JV), 2010/05/21
- [Qemu-devel] [PATCH -V3 1/7] virtio-9p: Introduces an option to specify the security model., Venkateswararao Jujjuri (JV), 2010/05/21
- [Qemu-devel] [PATCH -V3 2/7] virtio-9p: Rearrange fileop structures, Venkateswararao Jujjuri (JV), 2010/05/21