[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH-V7 03/10] virtio-9p: Security model for chmod
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [PATCH-V7 03/10] virtio-9p: Security model for chmod |
Date: |
Mon, 14 Jun 2010 13:34:42 -0700 |
Signed-off-by: Venkateswararao Jujjuri <address@hidden>
---
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)
--
1.6.5.2
- [Qemu-devel] [PATCH-V7 09/10] virtio-9p: Implement Security model for mknod, (continued)
- [Qemu-devel] [PATCH-V7 09/10] virtio-9p: Implement Security model for mknod, Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 01/10] virtio-9p: Introduces an option to specify the security model., Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 06/10] virtio-9p: Security model for create/open2, Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 02/10] virtio-9p: Make infrastructure for the new security model., Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 08/10] virtio-9p: Security model for symlink and readlink, Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 04/10] virtio-9p: Security model for chown, Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 05/10] virtio-9p: Implemented Security model for lstat and fstat, Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 03/10] virtio-9p: Security model for chmod,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [PATCH-V7 10/10] virtio-9p: Implement Security model for mksock using mknod., Venkateswararao Jujjuri (JV), 2010/06/14
- [Qemu-devel] [PATCH-V7 07/10] virtio-9p: Security model for mkdir, Venkateswararao Jujjuri (JV), 2010/06/14