Skip to contentSkip to conversation

uprobes-use-pagesize-aligned-virtual-address-when-replacing-pages.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 26, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: uprobes: use pagesize-aligned virtual address when replacing pages
has been removed from the -mm tree. Its filename was
uprobes-use-pagesize-aligned-virtual-address-when-replacing-pages.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: uprobes: use pagesize-aligned virtual address when replacing pages
Date: Mon, 15 Jan 2024 11:07:31 +0100

uprobes passes an unaligned page mapping address to folio_add_new_anon_rmap(), which ends up triggering a VM_BUG_ON() we recently extended in commit 372cbd4d5a066 ("mm: non-pmd-mappable, large folios for folio_add_new_anon_rmap()").

Arguably, this is uprobes code doing something wrong; however, for the time being it would have likely worked in rmap code because __folio_set_anon() would set folio->index to the same value.

Looking at __replace_page(), we'd also pass slightly wrong values to mmu_notifier_range_init(), page_vma_mapped_walk(), flush_cache_page(), ptep_clear_flush() and set_pte_at_notify(). I suspect most of them are fine, but let's just mark the introducing commit as the one needed fixing. I don't think CC stable is warranted.

We'll add more sanity checks in rmap code separately, to make sure that we always get properly aligned addresses.

Fixes c517ee744b96 ("uprobes: __replace_page() should not use page_address_in_vma()")
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Alexander Shishkin
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Adrian Hunter <[email protected]>

---

 kernel/events/uprobes.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/uprobes.c renamed from kernel/events/uprobes.c~uprobes-use-pagesize-aligned-virtual-address-when-replacing-pages +1 -1
@@ -537,7 +537,7 @@ retry:
 		}
 	}
 
-	ret = __replace_page(vma, vaddr, old_page, new_page);
+	ret = __replace_page(vma, vaddr & PAGE_MASK, old_page, new_page);
 	if (new_page)
 		put_page(new_page);
 put_old:

_

Patches currently in -mm which might be from [email protected] are