summaryrefslogtreecommitdiff
path: root/hw/9pfs/virtio-9p-local.c
diff options
context:
space:
mode:
authorM. Mohan Kumar <mohan@in.ibm.com>2012-01-19 12:21:12 +0530
committerAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2012-01-30 10:54:16 +0530
commit2d40564aaab3a99fe6ce00fc0fc893c02e9443ec (patch)
tree8b297266eff6d33d444051ded22b18f5b2669994 /hw/9pfs/virtio-9p-local.c
parent2c30dd744aa02d31a8a3b87daaba0b2cb774f346 (diff)
downloadqemu-2d40564aaab3a99fe6ce00fc0fc893c02e9443ec.tar.gz
hw/9pfs: Preserve S_ISGID
In passthrough security model in local fs driver, after a file creation chown and chmod are done to set the file credentials and mode as requested by 9p client. But if there was a request to create a file with S_ISGID bit, doing chown on that file resets the S_ISGID bit. So first call chown and then invoking chmod with proper mode bit retains the S_ISGID (if present/requested) This resulted in LTP mknod02, mknod03, mknod05, open10 test case failures. This patch fixes this issue. man 2 chown When the owner or group of an executable file are changed by an unprivileged user the S_ISUID and S_ISGID mode bits are cleared. POSIX does not specify whether this also should happen when root does the chown(); the Linux behavior depends on the kernel version. Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Diffstat (limited to 'hw/9pfs/virtio-9p-local.c')
-rw-r--r--hw/9pfs/virtio-9p-local.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index 6e3f9d1d97..33a41d2e18 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -257,9 +257,6 @@ static int local_post_create_passthrough(FsContext *fs_ctx, const char *path,
{
char buffer[PATH_MAX];
- if (chmod(rpath(fs_ctx, path, buffer), credp->fc_mode & 07777) < 0) {
- return -1;
- }
if (lchown(rpath(fs_ctx, path, buffer), credp->fc_uid,
credp->fc_gid) < 0) {
/*
@@ -270,6 +267,10 @@ static int local_post_create_passthrough(FsContext *fs_ctx, const char *path,
return -1;
}
}
+
+ if (chmod(rpath(fs_ctx, path, buffer), credp->fc_mode & 07777) < 0) {
+ return -1;
+ }
return 0;
}