Skip to content

Commit 1f2803b

Browse files
songmuchunakpm00
authored andcommitted
mm: kfence: fix handling discontiguous page
The struct pages could be discontiguous when the kfence pool is allocated via alloc_contig_pages() with CONFIG_SPARSEMEM and !CONFIG_SPARSEMEM_VMEMMAP. This may result in setting PG_slab and memcg_data to a arbitrary address (may be not used as a struct page), which in the worst case might corrupt the kernel. So the iteration should use nth_page(). Link: https://lkml.kernel.org/r/20230323025003.94447-1-songmuchun@bytedance.com Fixes: 0ce20dd ("mm: add Kernel Electric-Fence infrastructure") Signed-off-by: Muchun Song <songmuchun@bytedance.com> Reviewed-by: Marco Elver <elver@google.com> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Jann Horn <jannh@google.com> Cc: SeongJae Park <sjpark@amazon.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 3ee2d74 commit 1f2803b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

mm/kfence/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ static unsigned long kfence_init_pool(void)
556556
* enters __slab_free() slow-path.
557557
*/
558558
for (i = 0; i < KFENCE_POOL_SIZE / PAGE_SIZE; i++) {
559-
struct slab *slab = page_slab(&pages[i]);
559+
struct slab *slab = page_slab(nth_page(pages, i));
560560

561561
if (!i || (i % 2))
562562
continue;
@@ -602,7 +602,7 @@ static unsigned long kfence_init_pool(void)
602602

603603
reset_slab:
604604
for (i = 0; i < KFENCE_POOL_SIZE / PAGE_SIZE; i++) {
605-
struct slab *slab = page_slab(&pages[i]);
605+
struct slab *slab = page_slab(nth_page(pages, i));
606606

607607
if (!i || (i % 2))
608608
continue;

0 commit comments

Comments
 (0)