Skip to content

Commit d1beb4d

Browse files
ryanhrobgregkh
authored andcommitted
mm: kmsan: fix poisoning of high-order non-compound pages
[ Upstream commit 4795d20 ] kmsan_free_page() is called by the page allocator's free_pages_prepare() during page freeing. Its job is to poison all the memory covered by the page. It can be called with an order-0 page, a compound high-order page or a non-compound high-order page. But page_size() only works for order-0 and compound pages. For a non-compound high-order page it will incorrectly return PAGE_SIZE. The implication is that the tail pages of a high-order non-compound page do not get poisoned at free, so any invalid access while they are free could go unnoticed. It looks like the pages will be poisoned again at allocation time, so that would bookend the window. Fix this by using the order parameter to calculate the size. Link: https://lkml.kernel.org/r/20260104134348.3544298-1-ryan.roberts@arm.com Fixes: b073d7f ("mm: kmsan: maintain KMSAN metadata for page operations") Signed-off-by: Ryan Roberts <ryan.roberts@arm.com> Reviewed-by: Alexander Potapenko <glider@google.com> Tested-by: Alexander Potapenko <glider@google.com> Cc: Dmitriy Vyukov <dvyukov@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Marco Elver <elver@google.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> [ Adjust context ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2d402c6 commit d1beb4d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

mm/kmsan/shadow.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void kmsan_free_page(struct page *page, unsigned int order)
208208
return;
209209
kmsan_enter_runtime();
210210
kmsan_internal_poison_memory(page_address(page),
211-
page_size(page),
211+
PAGE_SIZE << order,
212212
GFP_KERNEL,
213213
KMSAN_POISON_CHECK | KMSAN_POISON_FREE);
214214
kmsan_leave_runtime();

0 commit comments

Comments
 (0)