From nobody Sat Oct 4 17:34:10 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 31A68214232; Wed, 13 Aug 2025 17:53:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755107628; cv=none; b=Ex5+kZ9kdMXjxeL/k7r2cs3QY1UqGnQCu5sIbekRIGuiyLKkncooXd2B1WCdEg8wWdhODwB77f1rfxY0yJW2Itaj/ZvxW0Lx8YdWL1EfZ+gpQJK5CxNVpIHqNoP/EaFRLDzWQmhcIk60zm5xD3rGuXpn5VlaSeYD4n1Qhfxe7ck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755107628; c=relaxed/simple; bh=nJTaRS1ZsYZdZpksK+de9qw7SkoDc8Q4sVGBFvEtL9Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tVF+CiV6AEGS3ukjE9ZDpgm6W8fTy5yfW5AmLp9u1sPIIye6WwPhc87naKu+jOKKi6AaFQI1hRTj0BkyO4RJiTD3OL+M6RbmcY9ICHEMdA0qkpEcJP7FvTEg7y6gkc0yoF+4h00urVPWj2jIlu6xlUWPitqd/rGHWDR+XaaoqqQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D8C814BF; Wed, 13 Aug 2025 10:53:37 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8C8493F5A1; Wed, 13 Aug 2025 10:53:41 -0700 (PDT) From: Yeoreum Yun To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, scott@os.amperecomputing.com, jhubbard@nvidia.com, pankaj.gupta@amd.com, leitao@debian.org, kaleshsingh@google.com, maz@kernel.org, broonie@kernel.org, oliver.upton@linux.dev, james.morse@arm.com, ardb@kernel.org, hardevsinh.palaniya@siliconsignals.io, david@redhat.com, yang@os.amperecomputing.com Cc: kasan-dev@googlegroups.com, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, Yeoreum Yun Subject: [PATCH v2 1/2] kasan/hw-tags: introduce kasan.store_only option Date: Wed, 13 Aug 2025 18:53:34 +0100 Message-Id: <20250813175335.3980268-2-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250813175335.3980268-1-yeoreum.yun@arm.com> References: <20250813175335.3980268-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since Armv8.9, FEATURE_MTE_STORE_ONLY feature is introduced to restrict raise of tag check fault on store operation only. Introcude KASAN store only mode based on this feature. KASAN store only mode restricts KASAN checks operation for store only and omits the checks for fetch/read operation when accessing memory. So it might be used not only debugging enviroment but also normal enviroment to check memory safty. This features can be controlled with "kasan.store_only" arguments. When "kasan.store_only=3Don", KASAN checks store only mode otherwise KASAN checks all operations. Signed-off-by: Yeoreum Yun --- Documentation/dev-tools/kasan.rst | 3 ++ arch/arm64/include/asm/memory.h | 1 + arch/arm64/include/asm/mte-kasan.h | 6 +++ arch/arm64/kernel/cpufeature.c | 6 +++ arch/arm64/kernel/mte.c | 14 ++++++ include/linux/kasan.h | 2 + mm/kasan/hw_tags.c | 76 +++++++++++++++++++++++++++++- mm/kasan/kasan.h | 10 ++++ 8 files changed, 116 insertions(+), 2 deletions(-) diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/ka= san.rst index 0a1418ab72fd..fcb70dd821ec 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -143,6 +143,9 @@ disabling KASAN altogether or controlling its features: Asymmetric mode: a bad access is detected synchronously on reads and asynchronously on writes. =20 +- ``kasan.store_only=3Doff`` or ``kasan.store_only=3Don`` controls whether= KASAN + checks the store (write) accesses only or all accesses (default: ``off``) + - ``kasan.vmalloc=3Doff`` or ``=3Don`` disables or enables tagging of vmal= loc allocations (default: ``on``). =20 diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memor= y.h index 5213248e081b..ae29cd3db78d 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -308,6 +308,7 @@ static inline const void *__tag_set(const void *addr, u= 8 tag) #define arch_enable_tag_checks_sync() mte_enable_kernel_sync() #define arch_enable_tag_checks_async() mte_enable_kernel_async() #define arch_enable_tag_checks_asymm() mte_enable_kernel_asymm() +#define arch_enable_tag_checks_store_only() mte_enable_kernel_store_only() #define arch_suppress_tag_checks_start() mte_enable_tco() #define arch_suppress_tag_checks_stop() mte_disable_tco() #define arch_force_async_tag_fault() mte_check_tfsr_exit() diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mt= e-kasan.h index 2e98028c1965..3e1cc341d47a 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -200,6 +200,7 @@ static inline void mte_set_mem_tag_range(void *addr, si= ze_t size, u8 tag, void mte_enable_kernel_sync(void); void mte_enable_kernel_async(void); void mte_enable_kernel_asymm(void); +int mte_enable_kernel_store_only(void); =20 #else /* CONFIG_ARM64_MTE */ =20 @@ -251,6 +252,11 @@ static inline void mte_enable_kernel_asymm(void) { } =20 +static inline int mte_enable_kenrel_store_only(void) +{ + return -EINVAL; +} + #endif /* CONFIG_ARM64_MTE */ =20 #endif /* __ASSEMBLY__ */ diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 9ad065f15f1d..7b724fcf20a7 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2404,6 +2404,11 @@ static void cpu_enable_mte(struct arm64_cpu_capabili= ties const *cap) =20 kasan_init_hw_tags_cpu(); } + +static void cpu_enable_mte_store_only(struct arm64_cpu_capabilities const = *cap) +{ + kasan_late_init_hw_tags_cpu(); +} #endif /* CONFIG_ARM64_MTE */ =20 static void user_feature_fixup(void) @@ -2922,6 +2927,7 @@ static const struct arm64_cpu_capabilities arm64_feat= ures[] =3D { .capability =3D ARM64_MTE_STORE_ONLY, .type =3D ARM64_CPUCAP_SYSTEM_FEATURE, .matches =3D has_cpuid_feature, + .cpu_enable =3D cpu_enable_mte_store_only, ARM64_CPUID_FIELDS(ID_AA64PFR2_EL1, MTESTOREONLY, IMP) }, #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index e5e773844889..8eb1f66f2ccd 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -157,6 +157,20 @@ void mte_enable_kernel_asymm(void) mte_enable_kernel_sync(); } } + +int mte_enable_kernel_store_only(void) +{ + if (!cpus_have_cap(ARM64_MTE_STORE_ONLY)) + return -EINVAL; + + sysreg_clear_set(sctlr_el1, SCTLR_EL1_TCSO_MASK, + SYS_FIELD_PREP(SCTLR_EL1, TCSO, 1)); + isb(); + + pr_info_once("MTE: enabled stonly mode at EL1\n"); + + return 0; +} #endif =20 #ifdef CONFIG_KASAN_HW_TAGS diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 890011071f2b..28951b29c593 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -552,9 +552,11 @@ static inline void kasan_init_sw_tags(void) { } #ifdef CONFIG_KASAN_HW_TAGS void kasan_init_hw_tags_cpu(void); void __init kasan_init_hw_tags(void); +void kasan_late_init_hw_tags_cpu(void); #else static inline void kasan_init_hw_tags_cpu(void) { } static inline void kasan_init_hw_tags(void) { } +static inline void kasan_late_init_hw_tags_cpu(void) { } #endif =20 #ifdef CONFIG_KASAN_VMALLOC diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 9a6927394b54..c2f90c06076e 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -41,9 +41,16 @@ enum kasan_arg_vmalloc { KASAN_ARG_VMALLOC_ON, }; =20 +enum kasan_arg_store_only { + KASAN_ARG_STORE_ONLY_DEFAULT, + KASAN_ARG_STORE_ONLY_OFF, + KASAN_ARG_STORE_ONLY_ON, +}; + static enum kasan_arg kasan_arg __ro_after_init; static enum kasan_arg_mode kasan_arg_mode __ro_after_init; static enum kasan_arg_vmalloc kasan_arg_vmalloc __initdata; +static enum kasan_arg_store_only kasan_arg_store_only __ro_after_init; =20 /* * Whether KASAN is enabled at all. @@ -67,6 +74,9 @@ DEFINE_STATIC_KEY_FALSE(kasan_flag_vmalloc); #endif EXPORT_SYMBOL_GPL(kasan_flag_vmalloc); =20 +DEFINE_STATIC_KEY_FALSE(kasan_flag_store_only); +EXPORT_SYMBOL_GPL(kasan_flag_store_only); + #define PAGE_ALLOC_SAMPLE_DEFAULT 1 #define PAGE_ALLOC_SAMPLE_ORDER_DEFAULT 3 =20 @@ -141,6 +151,23 @@ static int __init early_kasan_flag_vmalloc(char *arg) } early_param("kasan.vmalloc", early_kasan_flag_vmalloc); =20 +/* kasan.store_only=3Doff/on */ +static int __init early_kasan_flag_store_only(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "off")) + kasan_arg_store_only =3D KASAN_ARG_STORE_ONLY_OFF; + else if (!strcmp(arg, "on")) + kasan_arg_store_only =3D KASAN_ARG_STORE_ONLY_ON; + else + return -EINVAL; + + return 0; +} +early_param("kasan.store_only", early_kasan_flag_store_only); + static inline const char *kasan_mode_info(void) { if (kasan_mode =3D=3D KASAN_MODE_ASYNC) @@ -219,6 +246,20 @@ void kasan_init_hw_tags_cpu(void) kasan_enable_hw_tags(); } =20 +/* + * kasan_late_init_hw_tags_cpu_post() is called for each CPU after + * all cpus are bring-up at boot. + * Not marked as __init as a CPU can be hot-plugged after boot. + */ +void kasan_late_init_hw_tags_cpu(void) +{ + /* + * Enable stonly mode only when explicitly requested through the command = line. + * If system doesn't support, kasan checks all operation. + */ + kasan_enable_store_only(); +} + /* kasan_init_hw_tags() is called once on boot CPU. */ void __init kasan_init_hw_tags(void) { @@ -257,15 +298,28 @@ void __init kasan_init_hw_tags(void) break; } =20 + switch (kasan_arg_store_only) { + case KASAN_ARG_STORE_ONLY_DEFAULT: + /* Default is specified by kasan_flag_store_only definition. */ + break; + case KASAN_ARG_STORE_ONLY_OFF: + static_branch_disable(&kasan_flag_store_only); + break; + case KASAN_ARG_STORE_ONLY_ON: + static_branch_enable(&kasan_flag_store_only); + break; + } + kasan_init_tags(); =20 /* KASAN is now initialized, enable it. */ static_branch_enable(&kasan_flag_enabled); =20 - pr_info("KernelAddressSanitizer initialized (hw-tags, mode=3D%s, vmalloc= =3D%s, stacktrace=3D%s)\n", + pr_info("KernelAddressSanitizer initialized (hw-tags, mode=3D%s, vmalloc= =3D%s, stacktrace=3D%s store_only=3D%s\n", kasan_mode_info(), str_on_off(kasan_vmalloc_enabled()), - str_on_off(kasan_stack_collection_enabled())); + str_on_off(kasan_stack_collection_enabled()), + str_on_off(kasan_store_only_enabled())); } =20 #ifdef CONFIG_KASAN_VMALLOC @@ -394,6 +448,22 @@ void kasan_enable_hw_tags(void) hw_enable_tag_checks_sync(); } =20 +void kasan_enable_store_only(void) +{ + if (kasan_arg_store_only =3D=3D KASAN_ARG_STORE_ONLY_ON) { + if (hw_enable_tag_checks_store_only()) { + static_branch_disable(&kasan_flag_store_only); + kasan_arg_store_only =3D KASAN_ARG_STORE_ONLY_OFF; + pr_warn_once("KernelAddressSanitizer: store only mode isn't supported (= hw-tags)\n"); + } + } +} + +bool kasan_store_only_enabled(void) +{ + return static_branch_unlikely(&kasan_flag_store_only); +} + #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) =20 EXPORT_SYMBOL_IF_KUNIT(kasan_enable_hw_tags); @@ -404,4 +474,6 @@ VISIBLE_IF_KUNIT void kasan_force_async_fault(void) } EXPORT_SYMBOL_IF_KUNIT(kasan_force_async_fault); =20 +EXPORT_SYMBOL_IF_KUNIT(kasan_store_only_enabled); + #endif diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 129178be5e64..1d853de1c499 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -33,6 +33,7 @@ static inline bool kasan_stack_collection_enabled(void) #include "../slab.h" =20 DECLARE_STATIC_KEY_TRUE(kasan_flag_vmalloc); +DECLARE_STATIC_KEY_FALSE(kasan_flag_stonly); =20 enum kasan_mode { KASAN_MODE_SYNC, @@ -428,6 +429,7 @@ static inline const void *arch_kasan_set_tag(const void= *addr, u8 tag) #define hw_enable_tag_checks_sync() arch_enable_tag_checks_sync() #define hw_enable_tag_checks_async() arch_enable_tag_checks_async() #define hw_enable_tag_checks_asymm() arch_enable_tag_checks_asymm() +#define hw_enable_tag_checks_store_only() arch_enable_tag_checks_store_onl= y() #define hw_suppress_tag_checks_start() arch_suppress_tag_checks_start() #define hw_suppress_tag_checks_stop() arch_suppress_tag_checks_stop() #define hw_force_async_tag_fault() arch_force_async_tag_fault() @@ -437,10 +439,18 @@ static inline const void *arch_kasan_set_tag(const vo= id *addr, u8 tag) arch_set_mem_tag_range((addr), (size), (tag), (init)) =20 void kasan_enable_hw_tags(void); +void kasan_enable_store_only(void); +bool kasan_store_only_enabled(void); =20 #else /* CONFIG_KASAN_HW_TAGS */ =20 static inline void kasan_enable_hw_tags(void) { } +static inline void kasan_enable_store_only(void) { } + +static inline bool kasan_store_only_enabled(void) +{ + return false; +} =20 #endif /* CONFIG_KASAN_HW_TAGS */ =20 --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7} From nobody Sat Oct 4 17:34:10 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3ACD723D7D9; Wed, 13 Aug 2025 17:53:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755107632; cv=none; b=D7EuyQz9u2EBGe89jCOm1SsuAA9QD3diT14EdAhaBrSj6nrgaEC7IMq7UtN/7HmXbGtnWMVC5U8PlCOmoif7V1otoxyaMwETZmUk18CIYlqiNHPbdeyWWUpUd7ASd8mWjksd/9Um5M8Fvx9iOIwaHhe8lGFXd4L+4lzqSObjXaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755107632; c=relaxed/simple; bh=8I8wOKrE7rxSny7N/nRznIALNdh0um3dkNmtzoFxIFo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kvIyd7byZC3J2fZ/delAfwQmT8lSt3+l/AHH41Fz+jgz1QlBrIs9wky3EJZ+SCdfwdnRfIYebRqaDZseN+PrCkoydA/KNibj7Xa8OtCDNepUPHTILBaP2N1DucSOLfhLpA366q/uh80MZi88l3hNO19yvH++dOa3kMtyq4f33BQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9C08012FC; Wed, 13 Aug 2025 10:53:41 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BBD5A3F5A1; Wed, 13 Aug 2025 10:53:45 -0700 (PDT) From: Yeoreum Yun To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, scott@os.amperecomputing.com, jhubbard@nvidia.com, pankaj.gupta@amd.com, leitao@debian.org, kaleshsingh@google.com, maz@kernel.org, broonie@kernel.org, oliver.upton@linux.dev, james.morse@arm.com, ardb@kernel.org, hardevsinh.palaniya@siliconsignals.io, david@redhat.com, yang@os.amperecomputing.com Cc: kasan-dev@googlegroups.com, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, Yeoreum Yun Subject: [PATCH v2 2/2] kasan: apply store-only mode in kasan kunit testcases Date: Wed, 13 Aug 2025 18:53:35 +0100 Message-Id: <20250813175335.3980268-3-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250813175335.3980268-1-yeoreum.yun@arm.com> References: <20250813175335.3980268-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When KASAN is configured in store-only mode, fetch/load operations do not trigger tag check faults. As a result, the outcome of some test cases may differ compared to when KASAN is configured without store-only mode. Therefore, by modifying pre-exist testcases check the store only makes tag check fault (TCF) where writing is perform in "allocated memory" but tag is invalid (i.e) redzone write in atomic_set() testcases. Otherwise check the invalid fetch/read doesn't generate TCF. Also, skip some testcases affected by initial value (i.e) atomic_cmpxchg() testcase maybe successd if it passes valid atomic_t address and invalid oldaval address. In this case, if invalid atomic_t doesn't have the same oldval, it won't trigger store operation so the test will pass. Signed-off-by: Yeoreum Yun --- mm/kasan/kasan_test_c.c | 366 +++++++++++++++++++++++++++++++--------- 1 file changed, 286 insertions(+), 80 deletions(-) diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index 2aa12dfa427a..e5d08a6ee3a2 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -94,11 +94,13 @@ static void kasan_test_exit(struct kunit *test) } =20 /** - * KUNIT_EXPECT_KASAN_FAIL - check that the executed expression produces a - * KASAN report; causes a KUnit test failure otherwise. + * _KUNIT_EXPECT_KASAN_TEMPLATE - check that the executed expression produ= ces + * a KASAN report or not; a KUnit test failure when it's different from @p= roduce. * * @test: Currently executing KUnit test. - * @expression: Expression that must produce a KASAN report. + * @expr: Expression produce a KASAN report or not. + * @expr_str: Expression string + * @produce: expression should produce a KASAN report. * * For hardware tag-based KASAN, when a synchronous tag fault happens, tag * checking is auto-disabled. When this happens, this test handler reenabl= es @@ -110,25 +112,29 @@ static void kasan_test_exit(struct kunit *test) * Use READ/WRITE_ONCE() for the accesses and compiler barriers around the * expression to prevent that. * - * In between KUNIT_EXPECT_KASAN_FAIL checks, test_status.report_found is = kept + * In between _KUNIT_EXPECT_KASAN_TEMPLATE checks, test_status.report_foun= d is kept * as false. This allows detecting KASAN reports that happen outside of the * checks by asserting !test_status.report_found at the start of - * KUNIT_EXPECT_KASAN_FAIL and in kasan_test_exit. + * _KUNIT_EXPECT_KASAN_TEMPLATE and in kasan_test_exit. */ -#define KUNIT_EXPECT_KASAN_FAIL(test, expression) do { \ +#define _KUNIT_EXPECT_KASAN_TEMPLATE(test, expr, expr_str, produce) \ +do { \ if (IS_ENABLED(CONFIG_KASAN_HW_TAGS) && \ kasan_sync_fault_possible()) \ migrate_disable(); \ KUNIT_EXPECT_FALSE(test, READ_ONCE(test_status.report_found)); \ barrier(); \ - expression; \ + expr; \ barrier(); \ if (kasan_async_fault_possible()) \ kasan_force_async_fault(); \ - if (!READ_ONCE(test_status.report_found)) { \ - KUNIT_FAIL(test, KUNIT_SUBTEST_INDENT "KASAN failure " \ - "expected in \"" #expression \ - "\", but none occurred"); \ + if (READ_ONCE(test_status.report_found) !=3D produce) { \ + KUNIT_FAIL(test, KUNIT_SUBTEST_INDENT "KASAN %s " \ + "expected in \"" expr_str \ + "\", but %soccurred", \ + (produce ? "failure" : "success"), \ + (test_status.report_found ? \ + "" : "none ")); \ } \ if (IS_ENABLED(CONFIG_KASAN_HW_TAGS) && \ kasan_sync_fault_possible()) { \ @@ -141,6 +147,26 @@ static void kasan_test_exit(struct kunit *test) WRITE_ONCE(test_status.async_fault, false); \ } while (0) =20 +/* + * KUNIT_EXPECT_KASAN_FAIL - check that the executed expression produces a + * KASAN report; causes a KUnit test failure otherwise. + * + * @test: Currently executing KUnit test. + * @expr: Expression produce a KASAN report. + */ +#define KUNIT_EXPECT_KASAN_FAIL(test, expr) \ + _KUNIT_EXPECT_KASAN_TEMPLATE(test, expr, #expr, true) + +/* + * KUNIT_EXPECT_KASAN_SUCCESS - check that the executed expression doesn't + * produces a KASAN report; causes a KUnit test failure otherwise. + * + * @test: Currently executing KUnit test. + * @expr: Expression doesn't produce a KASAN report. + */ +#define KUNIT_EXPECT_KASAN_SUCCESS(test, expr) \ + _KUNIT_EXPECT_KASAN_TEMPLATE(test, expr, #expr, false) + #define KASAN_TEST_NEEDS_CONFIG_ON(test, config) do { \ if (!IS_ENABLED(config)) \ kunit_skip((test), "Test requires " #config "=3Dy"); \ @@ -183,8 +209,12 @@ static void kmalloc_oob_right(struct kunit *test) KUNIT_EXPECT_KASAN_FAIL(test, ptr[size + 5] =3D 'y'); =20 /* Out-of-bounds access past the aligned kmalloc object. */ - KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D - ptr[size + KASAN_GRANULE_SIZE + 5]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ptr[0] =3D + ptr[size + KASAN_GRANULE_SIZE + 5]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D + ptr[size + KASAN_GRANULE_SIZE + 5]); =20 kfree(ptr); } @@ -198,7 +228,11 @@ static void kmalloc_oob_left(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); =20 OPTIMIZER_HIDE_VAR(ptr); - KUNIT_EXPECT_KASAN_FAIL(test, *ptr =3D *(ptr - 1)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, *ptr =3D *(ptr - 1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, *ptr =3D *(ptr - 1)); + kfree(ptr); } =20 @@ -211,7 +245,11 @@ static void kmalloc_node_oob_right(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); =20 OPTIMIZER_HIDE_VAR(ptr); - KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D ptr[size]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ptr[0] =3D ptr[size]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D ptr[size]); + kfree(ptr); } =20 @@ -291,7 +329,10 @@ static void kmalloc_large_uaf(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); kfree(ptr); =20 - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[0]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); } =20 static void kmalloc_large_invalid_free(struct kunit *test) @@ -323,7 +364,11 @@ static void page_alloc_oob_right(struct kunit *test) ptr =3D page_address(pages); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); =20 - KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D ptr[size]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ptr[0] =3D ptr[size]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] =3D ptr[size]); + free_pages((unsigned long)ptr, order); } =20 @@ -338,7 +383,10 @@ static void page_alloc_uaf(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); free_pages((unsigned long)ptr, order); =20 - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[0]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); } =20 static void krealloc_more_oob_helper(struct kunit *test, @@ -455,10 +503,13 @@ static void krealloc_uaf(struct kunit *test) ptr1 =3D kmalloc(size1, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); kfree(ptr1); - KUNIT_EXPECT_KASAN_FAIL(test, ptr2 =3D krealloc(ptr1, size2, GFP_KERNEL)); KUNIT_ASSERT_NULL(test, ptr2); - KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)ptr1); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, *(volatile char *)ptr1); + else + KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)ptr1); } =20 static void kmalloc_oob_16(struct kunit *test) @@ -501,7 +552,11 @@ static void kmalloc_uaf_16(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); kfree(ptr2); =20 - KUNIT_EXPECT_KASAN_FAIL(test, *ptr1 =3D *ptr2); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, *ptr1 =3D *ptr2); + else + KUNIT_EXPECT_KASAN_FAIL(test, *ptr1 =3D *ptr2); + kfree(ptr1); } =20 @@ -640,8 +695,14 @@ static void kmalloc_memmove_invalid_size(struct kunit = *test) memset((char *)ptr, 0, 64); OPTIMIZER_HIDE_VAR(ptr); OPTIMIZER_HIDE_VAR(invalid_size); - KUNIT_EXPECT_KASAN_FAIL(test, - memmove((char *)ptr, (char *)ptr + 4, invalid_size)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + memmove((char *)ptr, (char *)ptr + 4, invalid_size)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + memmove((char *)ptr, (char *)ptr + 4, invalid_size)); + kfree(ptr); } =20 @@ -654,7 +715,11 @@ static void kmalloc_uaf(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); =20 kfree(ptr); - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[8]); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[8]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[8]); } =20 static void kmalloc_uaf_memset(struct kunit *test) @@ -701,7 +766,11 @@ static void kmalloc_uaf2(struct kunit *test) goto again; } =20 - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr1)[40]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr1)[40]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr1)[40]); + KUNIT_EXPECT_PTR_NE(test, ptr1, ptr2); =20 kfree(ptr2); @@ -727,19 +796,33 @@ static void kmalloc_uaf3(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); kfree(ptr2); =20 - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr1)[8]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr1)[8]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr1)[8]); } =20 static void kasan_atomics_helper(struct kunit *test, void *unsafe, void *s= afe) { int *i_unsafe =3D unsafe; =20 - KUNIT_EXPECT_KASAN_FAIL(test, READ_ONCE(*i_unsafe)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, READ_ONCE(*i_unsafe)); + else + KUNIT_EXPECT_KASAN_FAIL(test, READ_ONCE(*i_unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, WRITE_ONCE(*i_unsafe, 42)); - KUNIT_EXPECT_KASAN_FAIL(test, smp_load_acquire(i_unsafe)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, smp_load_acquire(i_unsafe)); + else + KUNIT_EXPECT_KASAN_FAIL(test, smp_load_acquire(i_unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, smp_store_release(i_unsafe, 42)); =20 - KUNIT_EXPECT_KASAN_FAIL(test, atomic_read(unsafe)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, atomic_read(unsafe)); + else + KUNIT_EXPECT_KASAN_FAIL(test, atomic_read(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_set(unsafe, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_add(42, unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_sub(42, unsafe)); @@ -752,18 +835,38 @@ static void kasan_atomics_helper(struct kunit *test, = void *unsafe, void *safe) KUNIT_EXPECT_KASAN_FAIL(test, atomic_xchg(unsafe, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_cmpxchg(unsafe, 21, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_try_cmpxchg(unsafe, safe, 42)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_try_cmpxchg(safe, unsafe, 42)); + + /* + * The result of the test below may vary due to garbage values of unsafe = in + * store-only mode. Therefore, skip this test when KASAN is configured + * in store-only mode. + */ + if (!kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_FAIL(test, atomic_try_cmpxchg(safe, unsafe, 42)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_sub_and_test(42, unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_and_test(unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_and_test(unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_add_negative(42, unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_add_unless(unsafe, 21, 42)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_not_zero(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_unless_negative(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_unless_positive(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_if_positive(unsafe)); =20 - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_read(unsafe)); + /* + * The result of the test below may vary due to garbage values of unsafe = in + * store-only mode. Therefore, skip this test when KASAN is configured + * in store-only mode. + */ + if (!kasan_store_only_enabled()) { + KUNIT_EXPECT_KASAN_FAIL(test, atomic_add_unless(unsafe, 21, 42)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_not_zero(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_unless_negative(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_unless_positive(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_if_positive(unsafe)); + } + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, atomic_long_read(unsafe)); + else + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_read(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_set(unsafe, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add(42, unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_sub(42, unsafe)); @@ -776,16 +879,32 @@ static void kasan_atomics_helper(struct kunit *test, = void *unsafe, void *safe) KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_xchg(unsafe, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_cmpxchg(unsafe, 21, 42)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_try_cmpxchg(unsafe, safe, 42)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_try_cmpxchg(safe, unsafe, 42)); + + /* + * The result of the test below may vary due to garbage values in + * store-only mode. Therefore, skip this test when KASAN is configured + * in store-only mode. + */ + if (!kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_try_cmpxchg(safe, unsafe, 42)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_sub_and_test(42, unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_and_test(unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_and_test(unsafe)); KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add_negative(42, unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add_unless(unsafe, 21, 42)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_not_zero(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_unless_negative(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_unless_positive(unsafe)); - KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_if_positive(unsafe)); + + /* + * The result of the test below may vary due to garbage values in + * store-only mode. Therefore, skip this test when KASAN is configured + * in store-only mode. + */ + if (!kasan_store_only_enabled()) { + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add_unless(unsafe, 21, 42)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_not_zero(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_unless_negative(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_unless_positive(unsafe)); + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_if_positive(unsafe)); + } } =20 static void kasan_atomics(struct kunit *test) @@ -842,8 +961,14 @@ static void ksize_unpoisons_memory(struct kunit *test) /* These must trigger a KASAN report. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC)) KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size]); - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size + 5]); - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[real_size - 1]); + + if (kasan_store_only_enabled()) { + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[size + 5]); + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[real_size - 1]); + } else { + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size + 5]); + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[real_size - 1]); + } =20 kfree(ptr); } @@ -863,8 +988,13 @@ static void ksize_uaf(struct kunit *test) =20 OPTIMIZER_HIDE_VAR(ptr); KUNIT_EXPECT_KASAN_FAIL(test, ksize(ptr)); - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size]); + if (kasan_store_only_enabled()) { + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[0]); + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[size]); + } else { + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size]); + } } =20 /* @@ -886,6 +1016,7 @@ static void rcu_uaf_reclaim(struct rcu_head *rp) container_of(rp, struct kasan_rcu_info, rcu); =20 kfree(fp); + ((volatile struct kasan_rcu_info *)fp)->i; } =20 @@ -899,9 +1030,14 @@ static void rcu_uaf(struct kunit *test) global_rcu_ptr =3D rcu_dereference_protected( (struct kasan_rcu_info __rcu *)ptr, NULL); =20 - KUNIT_EXPECT_KASAN_FAIL(test, - call_rcu(&global_rcu_ptr->rcu, rcu_uaf_reclaim); - rcu_barrier()); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + call_rcu(&global_rcu_ptr->rcu, rcu_uaf_reclaim); + rcu_barrier()); + else + KUNIT_EXPECT_KASAN_FAIL(test, + call_rcu(&global_rcu_ptr->rcu, rcu_uaf_reclaim); + rcu_barrier()); } =20 static void workqueue_uaf_work(struct work_struct *work) @@ -924,8 +1060,12 @@ static void workqueue_uaf(struct kunit *test) queue_work(workqueue, work); destroy_workqueue(workqueue); =20 - KUNIT_EXPECT_KASAN_FAIL(test, - ((volatile struct work_struct *)work)->data); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + ((volatile struct work_struct *)work)->data); + else + KUNIT_EXPECT_KASAN_FAIL(test, + ((volatile struct work_struct *)work)->data); } =20 static void kfree_via_page(struct kunit *test) @@ -972,7 +1112,10 @@ static void kmem_cache_oob(struct kunit *test) return; } =20 - KUNIT_EXPECT_KASAN_FAIL(test, *p =3D p[size + OOB_TAG_OFF]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, *p =3D p[size + OOB_TAG_OFF]); + else + KUNIT_EXPECT_KASAN_FAIL(test, *p =3D p[size + OOB_TAG_OFF]); =20 kmem_cache_free(cache, p); kmem_cache_destroy(cache); @@ -1068,7 +1211,10 @@ static void kmem_cache_rcu_uaf(struct kunit *test) */ rcu_barrier(); =20 - KUNIT_EXPECT_KASAN_FAIL(test, READ_ONCE(*p)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, READ_ONCE(*p)); + else + KUNIT_EXPECT_KASAN_FAIL(test, READ_ONCE(*p)); =20 kmem_cache_destroy(cache); } @@ -1206,6 +1352,9 @@ static void mempool_oob_right_helper(struct kunit *te= st, mempool_t *pool, size_t if (IS_ENABLED(CONFIG_KASAN_GENERIC)) KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)&elem[size])[0]); + else if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + ((volatile char *)&elem[round_up(size, KASAN_GRANULE_SIZE)])[0]); else KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)&elem[round_up(size, KASAN_GRANULE_SIZE)])[0]); @@ -1273,7 +1422,11 @@ static void mempool_uaf_helper(struct kunit *test, m= empool_t *pool, bool page) mempool_free(elem, pool); =20 ptr =3D page ? page_address((struct page *)elem) : elem; - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)ptr)[0]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); } =20 static void mempool_kmalloc_uaf(struct kunit *test) @@ -1532,8 +1685,13 @@ static void kasan_memchr(struct kunit *test) =20 OPTIMIZER_HIDE_VAR(ptr); OPTIMIZER_HIDE_VAR(size); - KUNIT_EXPECT_KASAN_FAIL(test, - kasan_ptr_result =3D memchr(ptr, '1', size + 1)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + kasan_ptr_result =3D memchr(ptr, '1', size + 1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + kasan_ptr_result =3D memchr(ptr, '1', size + 1)); =20 kfree(ptr); } @@ -1559,8 +1717,14 @@ static void kasan_memcmp(struct kunit *test) =20 OPTIMIZER_HIDE_VAR(ptr); OPTIMIZER_HIDE_VAR(size); - KUNIT_EXPECT_KASAN_FAIL(test, - kasan_int_result =3D memcmp(ptr, arr, size+1)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + kasan_int_result =3D memcmp(ptr, arr, size+1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + kasan_int_result =3D memcmp(ptr, arr, size+1)); + kfree(ptr); } =20 @@ -1593,9 +1757,13 @@ static void kasan_strings(struct kunit *test) KUNIT_EXPECT_EQ(test, KASAN_GRANULE_SIZE - 2, strscpy(ptr, src + 1, KASAN_GRANULE_SIZE)); =20 - /* strscpy should fail if the first byte is unreadable. */ - KUNIT_EXPECT_KASAN_FAIL(test, strscpy(ptr, src + KASAN_GRANULE_SIZE, - KASAN_GRANULE_SIZE)); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, strscpy(ptr, src + KASAN_GRANULE_SIZE, + KASAN_GRANULE_SIZE)); + else + /* strscpy should fail if the first byte is unreadable. */ + KUNIT_EXPECT_KASAN_FAIL(test, strscpy(ptr, src + KASAN_GRANULE_SIZE, + KASAN_GRANULE_SIZE)); =20 kfree(src); kfree(ptr); @@ -1607,17 +1775,22 @@ static void kasan_strings(struct kunit *test) * will likely point to zeroed byte. */ ptr +=3D 16; - KUNIT_EXPECT_KASAN_FAIL(test, kasan_ptr_result =3D strchr(ptr, '1')); - - KUNIT_EXPECT_KASAN_FAIL(test, kasan_ptr_result =3D strrchr(ptr, '1')); - - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strcmp(ptr, "2")); =20 - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strncmp(ptr, "2", 1)); - - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strlen(ptr)); - - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strnlen(ptr, 1)); + if (kasan_store_only_enabled()) { + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_ptr_result =3D strchr(ptr, '1')); + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_ptr_result =3D strrchr(ptr, '1')); + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_int_result =3D strcmp(ptr, "2")); + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_int_result =3D strncmp(ptr, "2", = 1)); + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_int_result =3D strlen(ptr)); + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_int_result =3D strnlen(ptr, 1)); + } else { + KUNIT_EXPECT_KASAN_FAIL(test, kasan_ptr_result =3D strchr(ptr, '1')); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_ptr_result =3D strrchr(ptr, '1')); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strcmp(ptr, "2")); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strncmp(ptr, "2", 1)); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strlen(ptr)); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D strnlen(ptr, 1)); + } } =20 static void kasan_bitops_modify(struct kunit *test, int nr, void *addr) @@ -1636,12 +1809,25 @@ static void kasan_bitops_test_and_modify(struct kun= it *test, int nr, void *addr) { KUNIT_EXPECT_KASAN_FAIL(test, test_and_set_bit(nr, addr)); KUNIT_EXPECT_KASAN_FAIL(test, __test_and_set_bit(nr, addr)); - KUNIT_EXPECT_KASAN_FAIL(test, test_and_set_bit_lock(nr, addr)); + + /* + * When KASAN is running in store-only mode, + * a fault won't occur even if the bit is set. + * Therefore, skip the test_and_set_bit_lock test in store-only mode. + */ + if (!kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_FAIL(test, test_and_set_bit_lock(nr, addr)); + KUNIT_EXPECT_KASAN_FAIL(test, test_and_clear_bit(nr, addr)); KUNIT_EXPECT_KASAN_FAIL(test, __test_and_clear_bit(nr, addr)); KUNIT_EXPECT_KASAN_FAIL(test, test_and_change_bit(nr, addr)); KUNIT_EXPECT_KASAN_FAIL(test, __test_and_change_bit(nr, addr)); - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D test_bit(nr, addr)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, kasan_int_result =3D test_bit(nr, addr)= ); + else + KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D test_bit(nr, addr)); + if (nr < 7) KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result =3D xor_unlock_is_negative_byte(1 << nr, addr)); @@ -1765,7 +1951,10 @@ static void vmalloc_oob(struct kunit *test) KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)v_ptr)[size]); =20 /* An aligned access into the first out-of-bounds granule. */ - KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)v_ptr)[size + 5]); + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, ((volatile char *)v_ptr)[size + 5]); + else + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)v_ptr)[size + 5]); =20 /* Check that in-bounds accesses to the physical page are valid. */ page =3D vmalloc_to_page(v_ptr); @@ -2042,16 +2231,33 @@ static void copy_user_test_oob(struct kunit *test) =20 KUNIT_EXPECT_KASAN_FAIL(test, unused =3D copy_from_user(kmem, usermem, size + 1)); - KUNIT_EXPECT_KASAN_FAIL(test, - unused =3D copy_to_user(usermem, kmem, size + 1)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + unused =3D copy_to_user(usermem, kmem, size + 1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + unused =3D copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, unused =3D __copy_from_user(kmem, usermem, size + 1)); - KUNIT_EXPECT_KASAN_FAIL(test, - unused =3D __copy_to_user(usermem, kmem, size + 1)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + unused =3D __copy_to_user(usermem, kmem, size + 1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + unused =3D __copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, unused =3D __copy_from_user_inatomic(kmem, usermem, size + 1)); - KUNIT_EXPECT_KASAN_FAIL(test, - unused =3D __copy_to_user_inatomic(usermem, kmem, size + 1)); + + if (kasan_store_only_enabled()) + KUNIT_EXPECT_KASAN_SUCCESS(test, + unused =3D __copy_to_user_inatomic(usermem, kmem, size + 1)); + else + KUNIT_EXPECT_KASAN_FAIL(test, + unused =3D __copy_to_user_inatomic(usermem, kmem, size + 1)); =20 /* * Prepare a long string in usermem to avoid the strncpy_from_user test --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}