qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [V11 10/15] virtio-9p: Move file post creation changes to n


From: M. Mohan Kumar
Subject: [Qemu-devel] [V11 10/15] virtio-9p: Move file post creation changes to none security model
Date: Fri, 24 Jun 2011 13:52:19 +0530

From: "M. Mohan Kumar" <address@hidden>

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 864a464..2645da0 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -152,23 +152,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;
 }
@@ -333,7 +326,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;
@@ -381,7 +374,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;
@@ -463,7 +456,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.5.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]