Skip to content

Commit 2e550c8

Browse files
committed
mm: cachestat: fix two shmem bugs
jira LE-1907 cve CVE-2024-35797 Rebuild_History Non-Buildable kernel-5.14.0-427.35.1.el9_4 commit-author Johannes Weiner <hannes@cmpxchg.org> commit d5d39c7 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/20240315095556.GC581298@cmpxchg.org Fixes: cf264e1 ("cachestat: implement cachestat syscall") Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reported-by: Chengming Zhou <chengming.zhou@linux.dev> [Bug #1] Reported-by: Jann Horn <jannh@google.com> [Bug #2] Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> Reviewed-by: Nhat Pham <nphamcs@gmail.com> Cc: <stable@vger.kernel.org> [v6.5+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit d5d39c7) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 4924f0f commit 2e550c8

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
@@ -3986,7 +3986,23 @@ static void filemap_cachestat(struct address_space *mapping,
39863986
/* shmem file - in swap cache */
39873987
swp_entry_t swp = radix_to_swp_entry(folio);
39883988

3989+
/* swapin error results in poisoned entry */
3990+
if (non_swap_entry(swp))
3991+
goto resched;
3992+
3993+
/*
3994+
* Getting a swap entry from the shmem
3995+
* inode means we beat
3996+
* shmem_unuse(). rcu_read_lock()
3997+
* ensures swapoff waits for us before
3998+
* freeing the swapper space. However,
3999+
* we can race with swapping and
4000+
* invalidation, so there might not be
4001+
* a shadow in the swapcache (yet).
4002+
*/
39894003
shadow = get_shadow_from_swap_cache(swp);
4004+
if (!shadow)
4005+
goto resched;
39904006
}
39914007
#endif
39924008
if (workingset_test_recent(shadow, true, &workingset))

0 commit comments

Comments
 (0)