fuse: fix pipe buffer lifetime for direct_io
commit0c4bcfdecb
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:c3021629a0
("fuse: support splice() reading from fuse device") Cc: <stable@vger.kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
d60d34b4d6
Коммит
ca62747b38
|
@ -941,7 +941,17 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,
|
||||||
|
|
||||||
while (count) {
|
while (count) {
|
||||||
if (cs->write && cs->pipebufs && page) {
|
if (cs->write && cs->pipebufs && page) {
|
||||||
return fuse_ref_page(cs, page, offset, count);
|
/*
|
||||||
|
* Can't control lifetime of pipe buffers, so always
|
||||||
|
* copy user pages.
|
||||||
|
*/
|
||||||
|
if (cs->req->args->user_pages) {
|
||||||
|
err = fuse_copy_fill(cs);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
} else {
|
||||||
|
return fuse_ref_page(cs, page, offset, count);
|
||||||
|
}
|
||||||
} else if (!cs->len) {
|
} else if (!cs->len) {
|
||||||
if (cs->move_pages && page &&
|
if (cs->move_pages && page &&
|
||||||
offset == 0 && count == PAGE_SIZE) {
|
offset == 0 && count == PAGE_SIZE) {
|
||||||
|
|
|
@ -1417,6 +1417,7 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii,
|
||||||
(PAGE_SIZE - ret) & (PAGE_SIZE - 1);
|
(PAGE_SIZE - ret) & (PAGE_SIZE - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ap->args.user_pages = true;
|
||||||
if (write)
|
if (write)
|
||||||
ap->args.in_pages = true;
|
ap->args.in_pages = true;
|
||||||
else
|
else
|
||||||
|
|
|
@ -256,6 +256,7 @@ struct fuse_args {
|
||||||
bool nocreds:1;
|
bool nocreds:1;
|
||||||
bool in_pages:1;
|
bool in_pages:1;
|
||||||
bool out_pages:1;
|
bool out_pages:1;
|
||||||
|
bool user_pages:1;
|
||||||
bool out_argvar:1;
|
bool out_argvar:1;
|
||||||
bool page_zeroing:1;
|
bool page_zeroing:1;
|
||||||
bool page_replace:1;
|
bool page_replace:1;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче