From: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
ARCH_HAS_EXECMEM_ROX was re-enabled in x86 at Linux 6.14 release.
vm_reset_perms() calculates range's start and end addresses using min()
and max() functions. To do that it compares pointers but, with KASAN
software tags mode enabled, some are tagged - addr variable is, while
start and end variables aren't. This can cause the wrong address to be
chosen and result in various errors in different places.
Reset tags in the address used as function argument in min(), max().
execmem_cache_add() adds tagged pointers to a maple tree structure,
which then are incorrectly compared when walking the tree. That results
in different pointers being returned later and page permission violation
errors panicking the kernel.
Reset tag of the address range inserted into the maple tree inside
execmem_vmalloc() which then gets propagated to execmem_cache_add().
Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
Acked-by: Alexander Potapenko <glider@google.com>
---
Changelog v7:
- Add Alexander's acked-by tag.
- Add comments on why these tag resets are needed (Alexander)
Changelog v6:
- Move back the tag reset from execmem_cache_add() to execmem_vmalloc()
(Mike Rapoport)
- Rewrite the changelogs to match the code changes from v6 and v5.
Changelog v5:
- Remove the within_range() change.
- arch_kasan_reset_tag -> kasan_reset_tag.
Changelog v4:
- Add patch to the series.
mm/execmem.c | 9 ++++++++-
mm/vmalloc.c | 7 ++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/mm/execmem.c b/mm/execmem.c
index 810a4ba9c924..dc7422222cf7 100644
--- a/mm/execmem.c
+++ b/mm/execmem.c
@@ -59,7 +59,14 @@ static void *execmem_vmalloc(struct execmem_range *range, size_t size,
return NULL;
}
- return p;
+ /*
+ * Resetting the tag here is necessary to avoid the tagged address
+ * ending up in the maple tree structure. There it's linear address
+ * can be incorrectly compared with other addresses which can result in
+ * a wrong address being picked down the line and for example a page
+ * permission violation error panicking the kernel.
+ */
+ return kasan_reset_tag(p);
}
struct vm_struct *execmem_vmap(size_t size)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 628f96e83b11..1479a7b362f4 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3354,7 +3354,12 @@ static void vm_reset_perms(struct vm_struct *area)
* the vm_unmap_aliases() flush includes the direct map.
*/
for (i = 0; i < area->nr_pages; i += 1U << page_order) {
- unsigned long addr = (unsigned long)page_address(area->pages[i]);
+ /*
+ * Addresses' tag needs resetting so it can be properly used in
+ * the min() and max() below. Otherwise the start or end values
+ * might be favoured.
+ */
+ unsigned long addr = (unsigned long)kasan_reset_tag(page_address(area->pages[i]));
if (addr) {
unsigned long page_size;
--
2.52.0