Skip to content

Commit d5d39c7

Browse files
hnazakpm00
authored andcommitted
mm: cachestat: fix two shmem bugs
When cachestat on shmem races with swapping and invalidation, there are two possible bugs: 1) A swapin error can have resulted in a poisoned swap entry in the shmem inode's xarray. Calling get_shadow_from_swap_cache() on it will result in an out-of-bounds access to swapper_spaces[]. Validate the entry with non_swap_entry() before going further. 2) When we find a valid swap entry in the shmem's inode, the shadow entry in the swapcache might not exist yet: swap IO is still in progress and we're before __remove_mapping; swapin, invalidation, or swapoff have removed the shadow from swapcache after we saw the shmem swap entry. This will send a NULL to workingset_test_recent(). The latter purely operates on pointer bits, so it won't crash - node 0, memcg ID 0, eviction timestamp 0, etc. are all valid inputs - but it's a bogus test. In theory that could result in a false "recently evicted" count. Such a false positive wouldn't be the end of the world. But for code clarity and (future) robustness, be explicit about this case. Bail on get_shadow_from_swap_cache() returning NULL. Link: https://lkml.kernel.org/r/[email protected] Fixes: cf264e1 ("cachestat: implement cachestat syscall") Signed-off-by: Johannes Weiner <[email protected]> Reported-by: Chengming Zhou <[email protected]> [Bug #1] Reported-by: Jann Horn <[email protected]> [Bug #2] Reviewed-by: Chengming Zhou <[email protected]> Reviewed-by: Nhat Pham <[email protected]> Cc: <[email protected]> [v6.5+] Signed-off-by: Andrew Morton <[email protected]>
1 parent 9cecde8 commit d5d39c7

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

mm/filemap.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4197,7 +4197,23 @@ static void filemap_cachestat(struct address_space *mapping,
41974197
/* shmem file - in swap cache */
41984198
swp_entry_t swp = radix_to_swp_entry(folio);
41994199

4200+
/* swapin error results in poisoned entry */
4201+
if (non_swap_entry(swp))
4202+
goto resched;
4203+
4204+
/*
4205+
* Getting a swap entry from the shmem
4206+
* inode means we beat
4207+
* shmem_unuse(). rcu_read_lock()
4208+
* ensures swapoff waits for us before
4209+
* freeing the swapper space. However,
4210+
* we can race with swapping and
4211+
* invalidation, so there might not be
4212+
* a shadow in the swapcache (yet).
4213+
*/
42004214
shadow = get_shadow_from_swap_cache(swp);
4215+
if (!shadow)
4216+
goto resched;
42014217
}
42024218
#endif
42034219
if (workingset_test_recent(shadow, true, &workingset))

0 commit comments

Comments
 (0)