Skip to content

Commit 0c67c37

Browse files
joannekoongMiklos Szeredi
authored andcommitted
fuse: revert back to __readahead_folio() for readahead
In commit 3eab9d7 ("fuse: convert readahead to use folios"), the logic was converted to using the new folio readahead code, which drops the reference on the folio once it is locked, using an inferred reference on the folio. Previously we held a reference on the folio for the entire duration of the readpages call. This is fine, however for the case for splice pipe responses where we will remove the old folio and splice in the new folio (see fuse_try_move_page()), we assume that there is a reference held on the folio for ap->folios, which is no longer the case. To fix this, revert back to __readahead_folio() which allows us to hold the reference on the folio for the duration of readpages until either we drop the reference ourselves in fuse_readpages_end() or the reference is dropped after it's replaced in the page cache in the splice case. This will fix the UAF bug that was reported. Link: https://lore.kernel.org/linux-fsdevel/[email protected]/ Fixes: 3eab9d7 ("fuse: convert readahead to use folios") Reported-by: Christian Heusel <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Closes: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/110 Reported-by: Mantas Mikulėnas <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Closes: https://bugzilla.opensuse.org/show_bug.cgi?id=1236660 Cc: <[email protected]> # v6.13 Signed-off-by: Joanne Koong <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
1 parent a64dcfb commit 0c67c37

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

fs/fuse/dev.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,12 @@ static int fuse_check_folio(struct folio *folio)
838838
return 0;
839839
}
840840

841+
/*
842+
* Attempt to steal a page from the splice() pipe and move it into the
843+
* pagecache. If successful, the pointer in @pagep will be updated. The
844+
* folio that was originally in @pagep will lose a reference and the new
845+
* folio returned in @pagep will carry a reference.
846+
*/
841847
static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
842848
{
843849
int err;

fs/fuse/file.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,8 +955,10 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args,
955955
fuse_invalidate_atime(inode);
956956
}
957957

958-
for (i = 0; i < ap->num_folios; i++)
958+
for (i = 0; i < ap->num_folios; i++) {
959959
folio_end_read(ap->folios[i], !err);
960+
folio_put(ap->folios[i]);
961+
}
960962
if (ia->ff)
961963
fuse_file_put(ia->ff, false);
962964

@@ -1048,7 +1050,14 @@ static void fuse_readahead(struct readahead_control *rac)
10481050
ap = &ia->ap;
10491051

10501052
while (ap->num_folios < cur_pages) {
1051-
folio = readahead_folio(rac);
1053+
/*
1054+
* This returns a folio with a ref held on it.
1055+
* The ref needs to be held until the request is
1056+
* completed, since the splice case (see
1057+
* fuse_try_move_page()) drops the ref after it's
1058+
* replaced in the page cache.
1059+
*/
1060+
folio = __readahead_folio(rac);
10521061
ap->folios[ap->num_folios] = folio;
10531062
ap->descs[ap->num_folios].length = folio_size(folio);
10541063
ap->num_folios++;

0 commit comments

Comments
 (0)