Skip to content

Commit 9f2ac64

Browse files
PanQLpalmer-dabbelt
authored andcommitted
riscv: mm: add missing memcpy in kasan_init
Hi Atish, It seems that the panic is due to the missing memcpy during kasan_init. Could you please check whether this patch is helpful? When doing kasan_populate, the new allocated base_pud/base_p4d should contain kasan_early_shadow_{pud, p4d}'s content. Add the missing memcpy to avoid page fault when read/write kasan shadow region. Tested on: - qemu with sv57 and CONFIG_KASAN on. - qemu with sv48 and CONFIG_KASAN on. Signed-off-by: Qinglin Pan <[email protected]> Tested-by: Atish Patra <[email protected]> Fixes: 8fbdccd ("riscv: mm: Support kasan for sv57") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 389ec68 commit 9f2ac64

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

arch/riscv/mm/kasan_init.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ static void __init kasan_populate_pud(pgd_t *pgd,
113113
base_pud = pt_ops.get_pud_virt(pfn_to_phys(_pgd_pfn(*pgd)));
114114
} else if (pgd_none(*pgd)) {
115115
base_pud = memblock_alloc(PTRS_PER_PUD * sizeof(pud_t), PAGE_SIZE);
116+
memcpy(base_pud, (void *)kasan_early_shadow_pud,
117+
sizeof(pud_t) * PTRS_PER_PUD);
116118
} else {
117119
base_pud = (pud_t *)pgd_page_vaddr(*pgd);
118120
if (base_pud == lm_alias(kasan_early_shadow_pud)) {
@@ -173,8 +175,11 @@ static void __init kasan_populate_p4d(pgd_t *pgd,
173175
base_p4d = pt_ops.get_p4d_virt(pfn_to_phys(_pgd_pfn(*pgd)));
174176
} else {
175177
base_p4d = (p4d_t *)pgd_page_vaddr(*pgd);
176-
if (base_p4d == lm_alias(kasan_early_shadow_p4d))
178+
if (base_p4d == lm_alias(kasan_early_shadow_p4d)) {
177179
base_p4d = memblock_alloc(PTRS_PER_PUD * sizeof(p4d_t), PAGE_SIZE);
180+
memcpy(base_p4d, (void *)kasan_early_shadow_p4d,
181+
sizeof(p4d_t) * PTRS_PER_P4D);
182+
}
178183
}
179184

180185
p4dp = base_p4d + p4d_index(vaddr);

0 commit comments

Comments
 (0)