diff options
| author | Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> | 2010-06-14 13:34:42 -0700 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-22 15:15:50 -0500 |
| commit | e95ead32efc48157de12e0a257ea1c52541a6ce1 (patch) | |
| tree | 863af9db5393b508315b5d8a762426f3ea036444 /hw | |
| parent | 758e8e38eb582e3dc87fd55a1d234c25108a7b7f (diff) | |
virtio-9p: Security model for chmod
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/file-op-9p.h | 2 | ||||
| -rw-r--r-- | hw/virtio-9p-local.c | 11 | ||||
| -rw-r--r-- | 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 307bd1eeef..1c8d89b597 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 056b4ba04b..9bdcf02b72 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 a7ba4b6abb..24291f4860 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) |