From patchwork Sat Nov 26 18:15:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13056543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA309C4332F for ; Sat, 26 Nov 2022 18:15:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E208C6B0072; Sat, 26 Nov 2022 13:15:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DCFE66B0073; Sat, 26 Nov 2022 13:15:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C97906B0074; Sat, 26 Nov 2022 13:15:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B77536B0072 for ; Sat, 26 Nov 2022 13:15:19 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 786474027C for ; Sat, 26 Nov 2022 18:15:19 +0000 (UTC) X-FDA: 80176395558.11.274239B Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) by imf08.hostedemail.com (Postfix) with ESMTP id F3BE5160012 for ; Sat, 26 Nov 2022 18:15:17 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1669486515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JDvTtFdWl1YXSMfasI4Saz9+J3V+bsk5xm78bG3AgR8=; b=DCYD0KPcyxtjNJVYy6HnI9aIp9UN1NOZmB15RRNNisl/+JIlP8nH+T8va/C39F3R2CskX+ JSvgWTHhm22MPGPI2B9fKoSlBT5WPofQE1mTwt+0rHXb5mJDPbFng957Bwzc/+u30VmA5O fTlC0571r0ej+/Nz6ILpPn6w+ZqN1T4= From: andrey.konovalov@linux.dev To: Marco Elver , David Gow Cc: Andrey Konovalov , Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH mm] kasan: fail non-kasan KUnit tests on KASAN reports Date: Sat, 26 Nov 2022 19:15:11 +0100 Message-Id: <655fd7e303b852809d3a8167d28091429f969c73.1669486407.git.andreyknvl@google.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669486518; a=rsa-sha256; cv=none; b=wmY+9YXApMpA8PEvgW5EYwlyvReu4sRj/+AsxhC70+EZDh/c71gG885bWPCU3D44NjAkbE yaxhxRw/CUNuZXKgwIAh19QsSRXbty7iExhEw1Mq14fm2yqYsdbTLPodpn24Kc28Fui5Ql c+ZQFb+3hgciUuQC2WAFanoEW/d625w= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DCYD0KPc; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.174 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669486518; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=JDvTtFdWl1YXSMfasI4Saz9+J3V+bsk5xm78bG3AgR8=; b=Y806EI50aYFt8pFhBb/Wo0nvPW/6vxu7EV/o+MTf2DN+16buSuSdRzJj8K+Bg926VlM0fo hmpj19/UlkHNs31H1zhSY/s02sMCqisZA95CE5zKdrAyhu5kdySaR24tqk6JkBZHhdiCdm upvkBonzM4yWLryrhom4vnEM7iXhfQI= X-Rspamd-Queue-Id: F3BE5160012 X-Stat-Signature: 47fkrtdt7qoty55ni4xpdebrhnrop113 X-Rspam-User: Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DCYD0KPc; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.174 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev X-Rspamd-Server: rspam09 X-HE-Tag: 1669486517-310171 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Andrey Konovalov After the recent changes done to KUnit-enabled KASAN tests, non-KASAN KUnit tests stopped being failed when KASAN report is detected. Recover that property by failing the currently running non-KASAN KUnit test when KASAN detects and prints a report for a bad memory access. Note that if the bad accesses happened in a kernel thread that doesn't have a reference to the currently running KUnit-test available via current->kunit_test, the test won't be failed. This is a limitation of KUnit, which doesn't yet provide a thread-agnostic way to find the reference to the currenly running test. Fixes: 49d9977ac909 ("kasan: check CONFIG_KASAN_KUNIT_TEST instead of CONFIG_KUNIT") Fixes: 7f29493ba529 ("kasan: switch kunit tests to console tracepoints") Signed-off-by: Andrey Konovalov --- mm/kasan/kasan.h | 6 ++++++ mm/kasan/kasan_test.c | 11 +++++++++++ mm/kasan/report.c | 22 ++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index a84491bc4867..08a83a7ef77f 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -548,6 +548,12 @@ void kasan_restore_multi_shot(bool enabled); #endif +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) +bool kasan_kunit_test_suite_executing(void); +#else +static bool kasan_kunit_test_suite_executing(void) { return false; } +#endif + /* * Exported functions for interfaces called from assembly or from generated * code. Declared here to avoid warnings about missing declarations. diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c index e27591ef2777..c9a615e892ed 100644 --- a/mm/kasan/kasan_test.c +++ b/mm/kasan/kasan_test.c @@ -32,6 +32,9 @@ #define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE) +/* Whether the KASAN KUnit test suite is currently being executed. */ +static bool executing; + static bool multishot; /* Fields set based on lines observed in the console. */ @@ -47,6 +50,11 @@ static struct { void *kasan_ptr_result; int kasan_int_result; +bool kasan_kunit_test_suite_executing(void) +{ + return READ_ONCE(executing); +} + /* Probe for console output: obtains test_status lines of interest. */ static void probe_console(void *ignore, const char *buf, size_t len) { @@ -76,6 +84,8 @@ static int kasan_suite_init(struct kunit_suite *suite) return -1; } + WRITE_ONCE(executing, true); + /* * Temporarily enable multi-shot mode. Otherwise, KASAN would only * report the first detected bug and panic the kernel if panic_on_warn @@ -94,6 +104,7 @@ static int kasan_suite_init(struct kunit_suite *suite) static void kasan_suite_exit(struct kunit_suite *suite) { + WRITE_ONCE(executing, false); kasan_restore_multi_shot(multishot); for_each_kernel_tracepoint(unregister_tracepoints, NULL); tracepoint_synchronize_unregister(); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 31355851a5ec..e718c997ecae 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -9,6 +9,7 @@ * Andrey Konovalov */ +#include #include #include #include @@ -112,10 +113,31 @@ EXPORT_SYMBOL_GPL(kasan_restore_multi_shot); #endif +#if IS_ENABLED(CONFIG_KUNIT) + +static void fail_nonkasan_kunit_test(void) +{ + struct kunit *test; + + if (!kasan_kunit_test_suite_executing()) + return; + + test = current->kunit_test; + if (test) + kunit_set_failure(test); +} + +#else /* CONFIG_KUNIT */ + +static void fail_nonkasan_kunit_test(void) { } + +#endif /* CONFIG_KUNIT */ + static DEFINE_SPINLOCK(report_lock); static void start_report(unsigned long *flags, bool sync) { + fail_nonkasan_kunit_test(); /* Respect the /proc/sys/kernel/traceoff_on_warning interface. */ disable_trace_on_warning(); /* Do not allow LOCKDEP mangling KASAN reports. */