Skip to content

Commit d0706c4

Browse files
author
CKI Backport Bot
committed
mm: swap: fix potential buffer overflow in setup_clusters()
JIRA: https://issues.redhat.com/browse/RHEL-114865 CVE: CVE-2025-39727 commit 152c133 Author: Kemeng Shi <shikemeng@huaweicloud.com> Date: Thu May 22 20:25:53 2025 +0800 mm: swap: fix potential buffer overflow in setup_clusters() In setup_swap_map(), we only ensure badpages are in range (0, last_page]. As maxpages might be < last_page, setup_clusters() will encounter a buffer overflow when a badpage is >= maxpages. Only call inc_cluster_info_page() for badpage which is < maxpages to fix the issue. Link: https://lkml.kernel.org/r/20250522122554.12209-4-shikemeng@huaweicloud.com Fixes: b843786 ("mm: swapfile: fix SSD detection with swapfile on btrfs") Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Reviewed-by: Baoquan He <bhe@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Kairui Song <kasong@tencent.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
1 parent 598732d commit d0706c4

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

mm/swapfile.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3322,9 +3322,13 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
33223322
* and the EOF part of the last cluster.
33233323
*/
33243324
inc_cluster_info_page(si, cluster_info, 0);
3325-
for (i = 0; i < swap_header->info.nr_badpages; i++)
3326-
inc_cluster_info_page(si, cluster_info,
3327-
swap_header->info.badpages[i]);
3325+
for (i = 0; i < swap_header->info.nr_badpages; i++) {
3326+
unsigned int page_nr = swap_header->info.badpages[i];
3327+
3328+
if (page_nr >= maxpages)
3329+
continue;
3330+
inc_cluster_info_page(si, cluster_info, page_nr);
3331+
}
33283332
for (i = maxpages; i < round_up(maxpages, SWAPFILE_CLUSTER); i++)
33293333
inc_cluster_info_page(si, cluster_info, i);
33303334

0 commit comments

Comments
 (0)