Commit 99db2821 authored Mar 07, 2022 by Miklos Szeredi Committed by Greg Kroah-Hartman Apr 15, 2022

fuse: fix pipe buffer lifetime for direct_io



commit 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 upstream.

In FOPEN_DIRECT_IO mode, fuse_file_write_iter() calls
fuse_direct_write_iter(), which normally calls fuse_direct_io(), which then
imports the write buffer with fuse_get_user_pages(), which uses
iov_iter_get_pages() to grab references to userspace pages instead of
actually copying memory.

On the filesystem device side, these pages can then either be read to
userspace (via fuse_dev_read()), or splice()d over into a pipe using
fuse_dev_splice_read() as pipe buffers with &nosteal_pipe_buf_ops.

This is wrong because after fuse_dev_do_read() unlocks the FUSE request,
the userspace filesystem can mark the request as completed, causing write()
to return. At that point, the userspace filesystem should no longer have
access to the pipe buffer.

Fix by copying pages coming from the user address space to new pipe
buffers.

Reported-by: Jann Horn <jannh@google.com>
Fixes: c3021629 ("fuse: support splice() reading from fuse device")
Cc: <stable@vger.kernel.org>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 693fe8af

fs/fuse/dev.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -999,7 +999,17 @@ static int fuse_copy_page(struct fuse_copy_state cs, struct page *pagep,

		while (count) {
		if (cs->write && cs->pipebufs && page) {
		/*
		* Can't control lifetime of pipe buffers, so always
		* copy user pages.
		*/
		if (cs->req->user_pages) {
		err = fuse_copy_fill(cs);
		if (err)
		return err;
		} else {
		return fuse_ref_page(cs, page, offset, count);
		}
		} else if (!cs->len) {
		if (cs->move_pages && page &&
		offset == 0 && count == PAGE_SIZE) {

fs/fuse/file.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1329,6 +1329,7 @@ static int fuse_get_user_pages(struct fuse_req req, struct iov_iter ii,
		(PAGE_SIZE - ret) & (PAGE_SIZE - 1);
		}

		req->user_pages = true;
		if (write)
		req->in.argpages = 1;
		else

fs/fuse/fuse_i.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -313,6 +313,8 @@ struct fuse_req {
		/** refcount */
		refcount_t count;

		bool user_pages;

		/** Unique ID for the interrupt request */
		u64 intr_unique;