diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2021-11-25 14:05:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-08 08:44:06 +0100 |
| commit | b4b7ea5ed8590d9beaf507fec06a14fc9fc09775 (patch) | |
| tree | 3999f656e4d4f8ade62c3c68d99d5ca0b85c79a6 | |
| parent | d000084465732186a3c9d2d0c197b6c5a88da113 (diff) | |
fuse: release pipe buf after last use
commit 473441720c8616dfaf4451f9c7ea14f0eb5e5d65 upstream.
Checking buf->flags should be done before the pipe_buf_release() is called
on the pipe buffer, since releasing the buffer might modify the flags.
This is exactly what page_cache_pipe_buf_release() does, and which results
in the same VM_BUG_ON_PAGE(PageLRU(page)) that the original patch was
trying to fix.
Reported-by: Justin Forbes <jmforbes@linuxtx.org>
Fixes: 712a951025c0 ("fuse: fix page stealing")
Cc: <stable@vger.kernel.org> # v2.6.35
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/fuse/dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 75fad41bc6e1..dc705e4be350 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -922,6 +922,11 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) return err; } + page_cache_get(newpage); + + if (!(buf->flags & PIPE_BUF_FLAG_LRU)) + lru_cache_add_file(newpage); + /* * Release while we have extra ref on stolen page. Otherwise * anon_pipe_buf_release() might think the page can be reused. @@ -929,11 +934,6 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) buf->ops->release(cs->pipe, buf); buf->ops = NULL; - page_cache_get(newpage); - - if (!(buf->flags & PIPE_BUF_FLAG_LRU)) - lru_cache_add_file(newpage); - err = 0; spin_lock(&cs->req->waitq.lock); if (test_bit(FR_ABORTED, &cs->req->flags)) |