Skip to content

Commit 52f2d5c

Browse files
ioworker0gregkh
authored andcommitted
mm/secretmem: fix use-after-free race in fault handler
commit 6f86d05 upstream. When a page fault occurs in a secret memory file created with `memfd_secret(2)`, the kernel will allocate a new folio for it, mark the underlying page as not-present in the direct map, and add it to the file mapping. If two tasks cause a fault in the same page concurrently, both could end up allocating a folio and removing the page from the direct map, but only one would succeed in adding the folio to the file mapping. The task that failed undoes the effects of its attempt by (a) freeing the folio again and (b) putting the page back into the direct map. However, by doing these two operations in this order, the page becomes available to the allocator again before it is placed back in the direct mapping. If another task attempts to allocate the page between (a) and (b), and the kernel tries to access it via the direct map, it would result in a supervisor not-present page fault. Fix the ordering to restore the direct map before the folio is freed. Link: https://lkml.kernel.org/r/[email protected] Fixes: 1507f51 ("mm: introduce memfd_secret system call to create "secret" memory areas") Signed-off-by: Lance Yang <[email protected]> Reported-by: Google Big Sleep <[email protected]> Closes: https://lore.kernel.org/linux-mm/CAEXGt5QeDpiHTu3K9tvjUTPqo+d-=wuCNYPa+6sWKrdQJ-ATdg@mail.gmail.com/ Acked-by: David Hildenbrand <[email protected]> Reviewed-by: Mike Rapoport (Microsoft) <[email protected]> Reviewed-by: Lorenzo Stoakes <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Mike Rapoport (Microsoft) <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a6226fa commit 52f2d5c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/secretmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)
8484
__folio_mark_uptodate(folio);
8585
err = filemap_add_folio(mapping, folio, offset, gfp);
8686
if (unlikely(err)) {
87-
folio_put(folio);
8887
/*
8988
* If a split of large page was required, it
9089
* already happened when we marked the page invalid
9190
* which guarantees that this call won't fail
9291
*/
9392
set_direct_map_default_noflush(page);
93+
folio_put(folio);
9494
if (err == -EEXIST)
9595
goto retry;
9696

0 commit comments

Comments
 (0)