|
 |
902636 |
From ade3dcad8a907d281549b341a8908851e36ba458 Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
902636 |
Date: Mon, 27 Jan 2020 19:01:31 +0100
|
|
|
902636 |
Subject: [PATCH 060/116] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV
|
|
|
902636 |
MIME-Version: 1.0
|
|
|
902636 |
Content-Type: text/plain; charset=UTF-8
|
|
|
902636 |
Content-Transfer-Encoding: 8bit
|
|
|
902636 |
|
|
|
902636 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
902636 |
Message-id: <20200127190227.40942-57-dgilbert@redhat.com>
|
|
|
902636 |
Patchwork-id: 93505
|
|
|
902636 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 056/112] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV
|
|
|
902636 |
Bugzilla: 1694164
|
|
|
902636 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
902636 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
902636 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
From: Vivek Goyal <vgoyal@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
Caller can set FUSE_WRITE_KILL_PRIV in write_flags. Parse it and pass it
|
|
|
902636 |
to the filesystem.
|
|
|
902636 |
|
|
|
902636 |
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
|
|
|
902636 |
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
|
|
|
902636 |
Reviewed-by: Sergio Lopez <slp@redhat.com>
|
|
|
902636 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
902636 |
(cherry picked from commit f779bc5265e7e7abb13a03d4bfbc74151afc15c2)
|
|
|
902636 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
902636 |
---
|
|
|
902636 |
tools/virtiofsd/fuse_common.h | 6 +++++-
|
|
|
902636 |
tools/virtiofsd/fuse_lowlevel.c | 4 +++-
|
|
|
902636 |
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h
|
|
|
902636 |
index f8f6433..686c42c 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_common.h
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_common.h
|
|
|
902636 |
@@ -93,8 +93,12 @@ struct fuse_file_info {
|
|
|
902636 |
*/
|
|
|
902636 |
unsigned int cache_readdir:1;
|
|
|
902636 |
|
|
|
902636 |
+ /* Indicates that suid/sgid bits should be removed upon write */
|
|
|
902636 |
+ unsigned int kill_priv:1;
|
|
|
902636 |
+
|
|
|
902636 |
+
|
|
|
902636 |
/** Padding. Reserved for future use*/
|
|
|
902636 |
- unsigned int padding:25;
|
|
|
902636 |
+ unsigned int padding:24;
|
|
|
902636 |
unsigned int padding2:32;
|
|
|
902636 |
|
|
|
902636 |
/*
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
index 02e1d83..2d6dc5a 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
@@ -1142,6 +1142,7 @@ static void do_write(fuse_req_t req, fuse_ino_t nodeid,
|
|
|
902636 |
memset(&fi, 0, sizeof(fi));
|
|
|
902636 |
fi.fh = arg->fh;
|
|
|
902636 |
fi.writepage = (arg->write_flags & FUSE_WRITE_CACHE) != 0;
|
|
|
902636 |
+ fi.kill_priv = !!(arg->write_flags & FUSE_WRITE_KILL_PRIV);
|
|
|
902636 |
|
|
|
902636 |
fi.lock_owner = arg->lock_owner;
|
|
|
902636 |
fi.flags = arg->flags;
|
|
|
902636 |
@@ -1177,7 +1178,8 @@ static void do_write_buf(fuse_req_t req, fuse_ino_t nodeid,
|
|
|
902636 |
fi.lock_owner = arg->lock_owner;
|
|
|
902636 |
fi.flags = arg->flags;
|
|
|
902636 |
fi.fh = arg->fh;
|
|
|
902636 |
- fi.writepage = arg->write_flags & FUSE_WRITE_CACHE;
|
|
|
902636 |
+ fi.writepage = !!(arg->write_flags & FUSE_WRITE_CACHE);
|
|
|
902636 |
+ fi.kill_priv = !!(arg->write_flags & FUSE_WRITE_KILL_PRIV);
|
|
|
902636 |
|
|
|
902636 |
if (ibufv->count == 1) {
|
|
|
902636 |
assert(!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD));
|
|
|
902636 |
--
|
|
|
902636 |
1.8.3.1
|
|
|
902636 |
|