On Tue, Aug 17, 2021 at 08:14:46PM -0400, Vivek Goyal wrote:
> On Tue, Aug 17, 2021 at 03:45:19PM -0400, Vivek Goyal wrote:
> > On Tue, Aug 17, 2021 at 10:27:16AM +0200, Hanna Reitz wrote:
> > > On 16.08.21 21:44, Vivek Goyal wrote:
> > > > On Wed, Aug 11, 2021 at 08:41:18AM +0200, Hanna Reitz wrote:
> > > >
> > > > [..]
> > > > > > > But given the inotify complications, there’s really a good reason
> > > > > > > we should
> > > > > > > use mountinfo.
> > > > > > >
> > > > > > > > > It’s a bit tricky because our sandboxing prevents easy access
> > > > > > > > > to mountinfo,
> > > > > > > > > but if that’s the only way...
> > > > > > > > yes. We already have lo->proc_self_fd. Maybe we need to keep
> > > > > > > > /proc/self/mountinfo open in lo->proc_self_mountinfo. I am
> > > > > > > > assuming
> > > > > > > > that any mount table changes will still be visible despite the
> > > > > > > > fact
> > > > > > > > I have fd open (and don't have to open new fd to notice new
> > > > > > > > mount/unmount
> > > > > > > > changes).
> > > > > > > Well, yes, that was my idea. Unfortunately, I wasn’t quite
> > > > > > > successful yet;
> > > > > > > when I tried keeping the fd open, reading from it would just
> > > > > > > return 0
> > > > > > > bytes. Perhaps that’s because we bind-mount /proc/self/fd to
> > > > > > > /proc so that
> > > > > > > nothing else in /proc is visible. Perhaps we need to bind-mount
> > > > > > > /proc/self/mountinfo into /proc/self/fd before that...
> > > > > > Or perhaps open /proc/self/mountinfo and save fd in
> > > > > > lo->proc_mountinfo
> > > > > > before /proc/self/fd is bind mounted on /proc?
> > > > > Yes, I tried that, and then reading would just return 0 bytes.
> > > > Hi Hanna,
> > > >
> > > > I tried this simple patch and I can read /proc/self/mountinfo before
> > > > bind mounting /proc/self/fd and after bind mounting /proc/self/fd. Am
> > > > I missing something.
> > >
> > > Yes, but I tried reading it in the main loop (where we’d actually need
> > > it).
> > > It looks like the umount2(".", MNT_DETACH) in setup_mounts() breaks it.
> >
> > Good point. I modified my code and notice too that after umoutn2() it
> > always reads 0 bytes. I can understand that all the other mount points
> > could go away but new rootfs mount point of virtiofsd should still be
> > visible, IIUC. I don't understand why.
> >
> > Anyway, I tried re-opening /proc/self/mountinfo file after umount2(".",
> > MNT_DETACH), and that seems to work and it shows root mount point. I
> > created a bind mount and it shows that too.
> >
> > So looks like quick fix can be that we re-open /proc/self/mountinfo. But
> > that means we can't bind /proc/self/fd on /proc/. We could bind mount
> > /proc/self on /proc. Not sure is it safe enough.
>
> Or may be I can do this.
>
> - Open O_PATH fd for /proc/self
> proc_self = open("/proc/self");
> - Bind mount /proc/self/fd on /proc
> - pivot_root() and umount() stuff
> - Openat(proc_self, "mountinfo")
> - close(proc_self)
>
> If this works, then we don't have the security issue and we managed
> to open mountinfo after pivot_root() and umount(). Will give it a
> try and see if it works tomorrow.
Hi Hanna,
This seems to work for me. I think key is to open mountinfo after
pivot_root() and then it works. If it is opened before pivot_root()
then it does not work. Not sure why.
Thanks
Vivek
---
tools/virtiofsd/passthrough_ll.c | 61 +++++++++++++++++++++++++++++++++++++--
1 file changed, 59 insertions(+), 2 deletions(-)
Index: rhvgoyal-qemu/tools/virtiofsd/passthrough_ll.c
===================================================================
--- rhvgoyal-qemu.orig/tools/virtiofsd/passthrough_ll.c 2021-08-16
15:29:27.712223551 -0400
+++ rhvgoyal-qemu/tools/virtiofsd/passthrough_ll.c 2021-08-18
09:29:34.653891067 -0400
@@ -172,6 +172,8 @@ struct lo_data {
/* An O_PATH file descriptor to /proc/self/fd/ */
int proc_self_fd;
+ int proc_mountinfo;
+ int proc_self;
int user_killpriv_v2, killpriv_v2;
/* If set, virtiofsd is responsible for setting umask during creation */
bool change_umask;
@@ -3403,6 +3405,47 @@ static void setup_wait_parent_capabiliti
capng_apply(CAPNG_SELECT_BOTH);
}
+static void read_mountinfo(struct lo_data *lo)
+{
+ char buf[4096];
+ ssize_t count, total_read = 0;
+ int ret;
+
+ ret = lseek(lo->proc_mountinfo, 0, SEEK_SET);
+ if (ret == -1) {
+ fuse_log(FUSE_LOG_ERR, "lseek(): %m\n");
+ exit(1);
+ }
+
+ do {
+ count = read(lo->proc_mountinfo, buf, 4095);
+ if (count == -1) {
+ fuse_log(FUSE_LOG_ERR, "read(/proc/self/mountinfo): %m\n");
+ exit(1);
+ }
+
+ //fuse_log(FUSE_LOG_INFO, "read(%d) bytes\n", count);
+ buf[count] = '\0';
+ fuse_log(FUSE_LOG_INFO, "%s", buf);
+ total_read += count;
+ } while(count);
+
+ fuse_log(FUSE_LOG_INFO, "read(%d) bytes\n", total_read);
+}
+
+static void open_mountinfo(struct lo_data *lo)
+{
+ int fd;
+
+ fd = openat(lo->proc_self, "mountinfo", O_RDONLY);
+ if (fd == -1) {
+ fuse_log(FUSE_LOG_ERR, "open(/proc/self/mountinfo, O_RDONLY): %m\n");
+ exit(1);
+ }
+
+ lo->proc_mountinfo = fd;
+}
+
/*
* Move to a new mount, net, and pid namespaces to isolate this process.
*/
@@ -3472,6 +3515,12 @@ static void setup_namespaces(struct lo_d
exit(1);
}
+ lo->proc_self = open("/proc/self", O_PATH);
+ if (lo->proc_self == -1) {
+ fuse_log(FUSE_LOG_ERR, "open(/proc/self, O_PATH): %m\n");
+ exit(1);
+ }
+
/*
* We only need /proc/self/fd. Prevent ".." from accessing parent
* directories of /proc/self/fd by bind-mounting it over /proc. Since / was
@@ -3524,7 +3573,7 @@ static void cleanup_capng(void)
* Make the source directory our root so symlinks cannot escape and no other
* files are accessible. Assumes unshare(CLONE_NEWNS) was already called.
*/
-static void setup_mounts(const char *source)
+static void setup_mounts(const char *source, struct lo_data *lo)
{
int oldroot;
int newroot;
@@ -3557,6 +3606,8 @@ static void setup_mounts(const char *sou
exit(1);
}
+ open_mountinfo(lo);
+
if (fchdir(oldroot) < 0) {
fuse_log(FUSE_LOG_ERR, "fchdir(oldroot): %m\n");
exit(1);
@@ -3567,11 +3618,17 @@ static void setup_mounts(const char *sou
exit(1);
}
+ fuse_log(FUSE_LOG_INFO, "mountinfo before umount2(., MNT_DETACH)\n");
+ read_mountinfo(lo);
+
if (umount2(".", MNT_DETACH) < 0) {
fuse_log(FUSE_LOG_ERR, "umount2(., MNT_DETACH): %m\n");
exit(1);
}
+ fuse_log(FUSE_LOG_INFO, "mountinfo after umount2(., MNT_DETACH):\n");
+ read_mountinfo(lo);
+
if (fchdir(newroot) < 0) {
fuse_log(FUSE_LOG_ERR, "fchdir(newroot): %m\n");
exit(1);
@@ -3720,7 +3777,7 @@ static void setup_sandbox(struct lo_data
{
if (lo->sandbox == SANDBOX_NAMESPACE) {
setup_namespaces(lo, se);
- setup_mounts(lo->source);
+ setup_mounts(lo->source, lo);
} else {
setup_chroot(lo);
}
