mm-migrate-fix-do_pages_stat-in-32-bit-mode.patch removed from -mm tree
The quilt patch titled
Subject: mm/migrate: fix do_pages_stat in compat mode
has been removed from the -mm tree. Its filename was
mm-migrate-fix-do_pages_stat-in-32-bit-mode.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Berg <[email protected]>
Subject: mm/migrate: fix do_pages_stat in compat mode
Date: Tue, 24 Jun 2025 16:44:27 +0200
For arrays with more than 16 entries, the old code would incorrectly advance the pages pointer by 16 words instead of 16 compat_uptr_t. Fix by doing the pointer arithmetic inside get_compat_pages_array where pages32 is already a correctly-typed pointer.
Discovered while working on PostgreSQL 18's new NUMA introspection code.
---
mm/migrate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
mm/migrate.c renamed from mm/migrate.c~mm-migrate-fix-do_pages_stat-in-32-bit-mode +8 -6
@@ -2399,6 +2399,7 @@ set_status:static int get_compat_pages_array (const void __user *chunk_pages[],const void __user *__user *pages, +unsigned long chunk_offset,unsigned long chunk_nr) {compat_uptr_t __user *pages32 = (compat_uptr_t __user *)pages;
@@ -2406,7 +2407,7 @@ static int get_compat_pages_array(constint i;for (i =0 ; i < chunk_nr; i++) { -if (get_user (p, pages32 + i)) +if (get_user (p, pages32 + chunk_offset + i))return -EFAULT ; chunk_pages[i] =compat_ptr (p); }
@@ -2425,27 +2426,28 @@ static int do_pages_stat(struct mm_struc#define DO_PAGES_STAT_CHUNK_NR 16ULconst void __user *chunk_pages[DO_PAGES_STAT_CHUNK_NR ];int chunk_status[DO_PAGES_STAT_CHUNK_NR ]; +unsigned long chunk_offset =0 ;while (nr_pages) {unsigned long chunk_nr =min (nr_pages,DO_PAGES_STAT_CHUNK_NR );if (in_compat_syscall ()) {if (get_compat_pages_array (chunk_pages, pages, - chunk_nr)) + chunk_offset, chunk_nr))break ; }else { -if (copy_from_user (chunk_pages, pages, +if (copy_from_user (chunk_pages, pages + chunk_offset, chunk_nr *sizeof (*chunk_pages)))break ; }do_pages_stat_array (mm, chunk_nr, chunk_pages, chunk_status); -if (copy_to_user (status, chunk_status, chunk_nr *sizeof (*status))) +if (copy_to_user (status + chunk_offset, chunk_status, + chunk_nr *sizeof (*status)))break ; - pages += chunk_nr; - status += chunk_nr; + chunk_offset += chunk_nr; nr_pages -= chunk_nr; }return nr_pages ? -EFAULT :0 ;
_
Patches currently in -mm which might be from [email protected] are