fuse: fix pipe buffer lifetime for direct_io
Subsystems (2)
PATCH 1/1 fuse: fix pipe buffer lifetime for direct_io
From: Miklos Szeredi <[email protected]>
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.
---
Applies against stable-v4.14 and stable-v4.19
struct fuse_args hasn't been piped through relevant functions yet, so place user_pages flag in an empty hole in struct fuse_req instead.
fs/fuse/dev.c | 12 +++++++++++- fs/fuse/file.c | 1 + fs/fuse/fuse_i.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)
fs/fuse/dev.c +11 -1
@@ -991,7 +991,17 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,while (count) {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->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
@@ -1325,6 +1325,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
@@ -312,6 +312,8 @@ struct fuse_req {/** refcount */ refcount_t count; +bool user_pages; +/** Unique ID for the interrupt request */ u64 intr_unique;
Signature · 1 line
2.35.1.1021.g381101b075-goog
Greg KH
maintainerQuoted 28 lines · Zach O'Keefe
From: Miklos Szeredi <[email protected]>
commit
0c4bcfdecb1ac0967619ee7ff44871d93c08c909upstream.In
FOPEN_DIRECT_IOmode,fuse_file_write_iter()callsfuse_direct_write_iter(), which normally callsfuse_direct_io(), which then imports the write buffer withfuse_get_user_pages(), which usesiov_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 usingfuse_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, causingwrite()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 <[email protected]>Fixes c3021629a0d8 ("fuse: support splice() reading from fuse device")Cc <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>Signed-off-by Zach O'Keefe <[email protected]>
Quoted 5 lines
---
Applies against stable-v4.14 and stable-v4.19struct
fuse_argshasn't been piped through relevant functions yet, so placeuser_pagesflag in an empty hole in structfuse_reqinstead.
Thanks for the backport, now queued up.
greg k-h