kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files.patch removed from -mm tree
The quilt patch titled
Subject: kasan: treat meminstrinsic as builtins in uninstrumented files
has been removed from the -mm tree. Its filename was
kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Marco Elver <[email protected]>
Subject: kasan: treat meminstrinsic as builtins in uninstrumented files
Date: Fri, 24 Feb 2023 09:59:40 +0100
Where the compiler instruments meminstrinsics by generating calls to __asan/__hwasan_ prefixed functions, let the compiler consider memintrinsics as builtin again.
To do so, never override memset/memmove/memcpy if the compiler does the correct instrumentation - even on !GENERIC_ENTRY architectures.
---
lib/Kconfig.kasan renamed from lib/Kconfig.kasan~kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files +9 -0
@@ -49,6 +49,15 @@ menuconfig KASAN if KASAN +config CC_HAS_KASAN_MEMINTRINSIC_PREFIX + def_bool (CC_IS_CLANG && $(cc-option,-fsanitize=kernel-address -mllvm -asan-kernel-mem-intrinsic-prefix=1)) || \ + (CC_IS_GCC && $(cc-option,-fsanitize=kernel-address --param asan-kernel-mem-intrinsic-prefix=1)) + # Don't define it if we don't need it: compilation of the test uses + # this variable to decide how the compiler should treat builtins. + depends on !KASAN_HW_TAGS + help + The compiler is able to prefix memintrinsics with __asan or __hwasan. + choice prompt "KASAN mode" default KASAN_GENERIC
mm/kasan/shadow.c renamed from mm/kasan/shadow.c~kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files +4 -1
@@ -38,11 +38,14 @@ bool __kasan_check_write(const volatile }EXPORT_SYMBOL (__kasan_check_write); -#ifndef CONFIG_GENERIC_ENTRY +#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX ) && !defined(CONFIG_GENERIC_ENTRY )/* * CONFIG_GENERIC_ENTRY relies on compiler emitted mem*() calls to not be * instrumented. KASAN enabled toolchains should emit __asan_mem*() functions * for the sites they want to instrument. +* +* If we have a compiler that can instrument meminstrinsics, never override +* these, so that non-instrumented files can safely consider them as builtins. */ #undef memsetvoid *memset (void *addr,int c,size_t len)
scripts/Makefile.kasan renamed from scripts/Makefile.kasan~kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files +9 -0
@@ -1,5 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 + +ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX +# Safe for compiler to generate meminstrinsic calls in uninstrumented files. +CFLAGS_KASAN_NOSANITIZE := +else +# Don't let compiler generate memintrinsic calls in uninstrumented files +# because they are instrumented. CFLAGS_KASAN_NOSANITIZE := -fno-builtin +endif + KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
_
Patches currently in -mm which might be from [email protected] are