diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 17:54:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 17:54:34 +0100 |
| commit | 686a7ac3f6b13a5800282ddd81d80d71f29f75d6 (patch) | |
| tree | a3b650893c5b948bb8a0f93c24d47e2712a9ef8b /mm | |
| parent | 18a549b897f99757e5ec7ed570222de21c36285f (diff) | |
| parent | c60ffec33ddf24577f6f4da18fe825b2058c5f78 (diff) | |
| download | linux-next-history-686a7ac3f6b13a5800282ddd81d80d71f29f75d6.tar.gz | |
Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 4 | ||||
| -rw-r--r-- | mm/kfence/core.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index e221fa1dc54d0..bb0202cf8b15d 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1300,7 +1300,7 @@ config ARCH_HAS_PTE_SPECIAL bool config MAPPING_DIRTY_HELPERS - bool + bool config KMAP_LOCAL bool @@ -1431,7 +1431,7 @@ config ARCH_HAS_USER_SHADOW_STACK bool help The architecture has hardware support for userspace shadow call - stacks (eg, x86 CET, arm64 GCS or RISC-V Zicfiss). + stacks (eg, x86 CET, arm64 GCS or RISC-V Zicfiss). config HAVE_ARCH_TLB_REMOVE_TABLE def_bool n diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 655dc5ce32409..ee6ae01de5aef 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -77,6 +77,11 @@ static int param_set_sample_interval(const char *val, const struct kernel_param WRITE_ONCE(kfence_enabled, false); } + if (num && kasan_hw_tags_enabled()) { + pr_info("disabled as KASAN HW tags are enabled\n"); + return -EINVAL; + } + *((unsigned long *)kp->arg) = num; if (num && !READ_ONCE(kfence_enabled) && system_state != SYSTEM_BOOTING) |