mm: open-code page_folio() in dump_page()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 25 Nov 2024 20:17:19 +0000 (20:17 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 6 Dec 2024 03:54:45 +0000 (19:54 -0800)
page_folio() calls page_fixed_fake_head() which will misidentify this page
as being a fake head and load off the end of 'precise'.  We may have a
pointer to a fake head, but that's OK because it contains the right
information for dump_page().

gcc-15 is smart enough to catch this with -Warray-bounds:

In function 'page_fixed_fake_head',
    inlined from '_compound_head' at ../include/linux/page-flags.h:251:24,
    inlined from '__dump_page' at ../mm/debug.c:123:11:
../include/asm-generic/rwonce.h:44:26: warning: array subscript 9 is outside
+array bounds of 'struct page[1]' [-Warray-bounds=]

Link: https://lkml.kernel.org/r/20241125201721.2963278-2-willy@infradead.org
Fixes: fae7d834c43c ("mm: add __dump_folio()")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reported-by: Kees Cook <kees@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/debug.c

index aa57d3ffd4edf6d8d8834f63c1a13f40f5287b89..95b6ab809c0ee6d7eb2548812ffa7c15e7a7b428 100644 (file)
@@ -124,19 +124,22 @@ static void __dump_page(const struct page *page)
 {
        struct folio *foliop, folio;
        struct page precise;
+       unsigned long head;
        unsigned long pfn = page_to_pfn(page);
        unsigned long idx, nr_pages = 1;
        int loops = 5;
 
 again:
        memcpy(&precise, page, sizeof(*page));
-       foliop = page_folio(&precise);
-       if (foliop == (struct folio *)&precise) {
+       head = precise.compound_head;
+       if ((head & 1) == 0) {
+               foliop = (struct folio *)&precise;
                idx = 0;
                if (!folio_test_large(foliop))
                        goto dump;
                foliop = (struct folio *)page;
        } else {
+               foliop = (struct folio *)(head - 1);
                idx = folio_page_idx(foliop, page);
        }