[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V12 10/15] hw/9pfs: Move file post creation changes
From: |
M. Mohan Kumar |
Subject: |
[Qemu-devel] [PATCH V12 10/15] hw/9pfs: Move file post creation changes to none security model |
Date: |
Mon, 5 Sep 2011 21:48:31 +0530 |
After creating a file object, its permission and ownership details are updated
as per 9p client's request for both passthrough and none security model.
But with chrooted environment its not required for passthrough security model.
Move all post file creation changes to none security model.
Signed-off-by: M. Mohan Kumar <address@hidden>
---
hw/9pfs/virtio-9p-local.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index 3b97f51..68551e2 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -155,23 +155,16 @@ static int local_set_xattr(const char *path, FsCred
*credp)
return 0;
}
-static int local_post_create_passthrough(FsContext *fs_ctx, const char *path,
- FsCred *credp)
+static int local_post_create_none(const char *path, FsCred *credp)
{
- char buffer[PATH_MAX];
+ int retval;
- if (chmod(rpath(fs_ctx, path, buffer), credp->fc_mode & 07777) < 0) {
+ if (chmod(path, credp->fc_mode & 07777) < 0) {
return -1;
}
- if (lchown(rpath(fs_ctx, path, buffer), credp->fc_uid,
- credp->fc_gid) < 0) {
- /*
- * If we fail to change ownership and if we are
- * using security model none. Ignore the error
- */
- if (fs_ctx->fs_sm != SM_NONE) {
- return -1;
- }
+ retval = lchown(path, credp->fc_uid, credp->fc_gid);
+ if (retval < 0) {
+ /* Ignore return value for none security model */
}
return 0;
}
@@ -347,7 +340,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath
*dir_path,
if (err == -1) {
goto out;
}
- err = local_post_create_passthrough(fs_ctx, path, credp);
+ err = local_post_create_none(buffer, credp);
if (err == -1) {
serrno = errno;
goto err_end;
@@ -395,7 +388,7 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath
*dir_path,
if (err == -1) {
goto out;
}
- err = local_post_create_passthrough(fs_ctx, path, credp);
+ err = local_post_create_none(buffer, credp);
if (err == -1) {
serrno = errno;
goto err_end;
@@ -482,7 +475,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath
*dir_path, const char *name,
err = fd;
goto out;
}
- err = local_post_create_passthrough(fs_ctx, path, credp);
+ err = local_post_create_none(buffer, credp);
if (err == -1) {
serrno = errno;
goto err_end;
--
1.7.6
- [Qemu-devel] [PATCH V12 00/15] virtio-9p: chroot environment for passthrough security model, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 12/15] hw/9pfs: chown in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 08/15] hw/9pfs: Removing file or directory in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 10/15] hw/9pfs: Move file post creation changes to none security model,
M. Mohan Kumar <=
- [Qemu-devel] [PATCH V12 14/15] hw/9pfs: readlink in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 09/15] hw/9pfs: Rename in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 15/15] hw/9pfs: Chroot environment for other functions, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 07/15] hw/9pfs: Creating special files in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 13/15] hw/9pfs: stat in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 11/15] hw/9pfs: chmod in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 04/15] hw/9pfs: qemu interfaces for chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 05/15] hw/9pfs: Support for opening a file in chroot environment, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 02/15] hw/9pfs: Enable CONFIG_THREAD if CONFIG_VIRTFS is enabled, M. Mohan Kumar, 2011/09/05
- [Qemu-devel] [PATCH V12 01/15] Implement qemu_read_full, M. Mohan Kumar, 2011/09/05