Skip to content

Commit 6434e69

Browse files
Barry Songakpm00
authored andcommitted
mm: arm64: fix the out-of-bounds issue in contpte_clear_young_dirty_ptes
We are passing a huge nr to __clear_young_dirty_ptes() right now. While we should pass the number of pages, we are actually passing CONT_PTE_SIZE. This is causing lots of crashes of MADV_FREE, panic oops could vary everytime. Link: https://lkml.kernel.org/r/20240524005444.135417-1-21cnbao@gmail.com Fixes: 89e8685 ("mm/arm64: override clear_young_dirty_ptes() batch helper") Signed-off-by: Barry Song <v-songbaohua@oppo.com> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Acked-by: Lance Yang <ioworker0@gmail.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Chris Li <chrisl@kernel.org> Cc: Barry Song <21cnbao@gmail.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Jeff Xie <xiehuan09@gmail.com> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Muchun Song <songmuchun@bytedance.com> Cc: Peter Xu <peterx@redhat.com> Cc: Yang Shi <shy828301@gmail.com> Cc: Yin Fengwei <fengwei.yin@intel.com> Cc: Zach O'Keefe <zokeefe@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 94d46bf commit 6434e69

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm64/mm/contpte.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma,
376376
* clearing access/dirty for the whole block.
377377
*/
378378
unsigned long start = addr;
379-
unsigned long end = start + nr;
379+
unsigned long end = start + nr * PAGE_SIZE;
380380

381381
if (pte_cont(__ptep_get(ptep + nr - 1)))
382382
end = ALIGN(end, CONT_PTE_SIZE);
@@ -386,7 +386,7 @@ void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma,
386386
ptep = contpte_align_down(ptep);
387387
}
388388

389-
__clear_young_dirty_ptes(vma, start, ptep, end - start, flags);
389+
__clear_young_dirty_ptes(vma, start, ptep, (end - start) / PAGE_SIZE, flags);
390390
}
391391
EXPORT_SYMBOL_GPL(contpte_clear_young_dirty_ptes);
392392

0 commit comments

Comments
 (0)