diff options
| author | Alexandre Ghiti <alexandre.ghiti@canonical.com> | 2022-02-25 13:39:51 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2022-03-03 15:32:41 -0800 |
| commit | c648c4bb7d02ceb53ee40172fdc4433b37cee9c6 (patch) | |
| tree | e67d89772dabc9fb768684f51f3a796a88cc8a25 | |
| parent | 5f763b3b59602735993149330ffa7e348bc85bc0 (diff) | |
| download | linux-c648c4bb7d02ceb53ee40172fdc4433b37cee9c6.tar.gz | |
riscv: Fix config KASAN && DEBUG_VIRTUAL
__virt_to_phys function is called very early in the boot process (ie
kasan_early_init) so it should not be instrumented by KASAN otherwise it
bugs.
Fix this by declaring phys_addr.c as non-kasan instrumentable.
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Fixes: 8ad8b72721d0 (riscv: Add KASAN support)
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
| -rw-r--r-- | arch/riscv/mm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index 7ebaef10ea1b69..ac7a25298a04af 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -24,6 +24,9 @@ obj-$(CONFIG_KASAN) += kasan_init.o ifdef CONFIG_KASAN KASAN_SANITIZE_kasan_init.o := n KASAN_SANITIZE_init.o := n +ifdef CONFIG_DEBUG_VIRTUAL +KASAN_SANITIZE_physaddr.o := n +endif endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o |