This is a note to let you know that I've just added the patch titled
riscv: Fix wrong usage of lm_alias() when splitting a huge linear mapping
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
riscv-fix-wrong-usage-of-lm_alias-when-splitting-a-huge-linear-mapping.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c29fc621e1a49949a14c7fa031dd4760087bfb29 Mon Sep 17 00:00:00 2001
From: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
Date: Tue, 12 Dec 2023 20:54:00 +0100
Subject: riscv: Fix wrong usage of lm_alias() when splitting a huge linear mapping
From: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
commit c29fc621e1a49949a14c7fa031dd4760087bfb29 upstream.
lm_alias() can only be used on kernel mappings since it explicitly uses
__pa_symbol(), so simply fix this by checking where the address belongs
to before.
Fixes: 311cd2f6e253 ("riscv: Fix set_memory_XX() and set_direct_map_XX() by splitting huge linear mappings")
Reported-by: syzbot+afb726d49f84c8d95ee1@xxxxxxxxxxxxxxxxxxxxxxxxx
Closes: https://lore.kernel.org/linux-riscv/000000000000620dd0060c02c5e1@xxxxxxxxxx/
Signed-off-by: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
Reviewed-by: Charlie Jenkins <charlie@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20231212195400.128457-1-alexghiti@xxxxxxxxxxxx
Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/riscv/mm/pageattr.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/arch/riscv/mm/pageattr.c
+++ b/arch/riscv/mm/pageattr.c
@@ -304,8 +304,13 @@ static int __set_memory(unsigned long ad
goto unlock;
}
} else if (is_kernel_mapping(start) || is_linear_mapping(start)) {
- lm_start = (unsigned long)lm_alias(start);
- lm_end = (unsigned long)lm_alias(end);
+ if (is_kernel_mapping(start)) {
+ lm_start = (unsigned long)lm_alias(start);
+ lm_end = (unsigned long)lm_alias(end);
+ } else {
+ lm_start = start;
+ lm_end = end;
+ }
ret = split_linear_mapping(lm_start, lm_end);
if (ret)
Patches currently in stable-queue which might be from alexghiti@xxxxxxxxxxxx are
queue-6.1/riscv-check-if-the-code-to-patch-lies-in-the-exit-se.patch
queue-6.1/riscv-fix-set_memory_xx-and-set_direct_map_xx-by-spl.patch
queue-6.1/riscv-fix-wrong-usage-of-lm_alias-when-splitting-a-huge-linear-mapping.patch
queue-6.1/riscv-fix-module_alloc-that-did-not-reset-the-linear.patch
queue-6.1/riscv-fix-set_direct_map_default_noflush-to-reset-_p.patch
