From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D2D2C11F66 for ; Tue, 13 Jul 2021 18:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23E1B6127C for ; Tue, 13 Jul 2021 18:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234205AbhGMSnv (ORCPT ); Tue, 13 Jul 2021 14:43:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbhGMSnt (ORCPT ); Tue, 13 Jul 2021 14:43:49 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D833BC0613DD; Tue, 13 Jul 2021 11:40:58 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id dt7so13481282ejc.12; Tue, 13 Jul 2021 11:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QQpf5xOaOqo0s/plb1U3NgMNZX1Ph8Dt44evAisR+l0=; b=gI7n/qI/DkL7SIT4shqKYtKHWdM176gJQ3/2RrZOVcCXPfG3EbUy0bDedEoBuILbpr CORECQF9iy1EkOD3hP9IHmXZ44XRBdjIs8sBXI2ozzNvMcmlMTmrdANT4RNAU+w8xj8G J7eUfJnhuD343zLi1dXayV9MAKCc3KSG1f9wePXJfVqfeVIb7OUS4KYYUZMd8EQxsX/H wWUc0Qhpve1BBC1OconHChBafgEAEQ27DJIul2rLsMOyDgWl4upMFHXuURFasV4lT56Y Z5LoII4Nkvv594aDEvDTbKWa51/5nk67U4dBgAYdty4lCqqvATA4epnFmJoN3qk7B6CQ S5fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QQpf5xOaOqo0s/plb1U3NgMNZX1Ph8Dt44evAisR+l0=; b=kITSwvR4n3NXAQQUzLXJeHXhGauWAvZy8CPcLzAIQ8g7eLdcNUO/HC0prtT1H+Zprp 4IdZ67oXcUWwQs3NKWw1E9DvzjLVOgI5IEA5gRNFcd4KL6JkFUrwmHRlAodV0LT9/aus J+s5I6obDTzmtCjDqtrRu9XeiYG4fuBGEL3SrgQN+HreYv/5piK+7KibVXekJeseC3Ix eVcDhQZnpXiGC0BuksI8NM9fgftH5LsTQgdRg3pihLGlvdkp0kTPnfiEIrYWcaV/quVY vhdA6qxOXFr62/hpgDt26hm8g3rrxEkDENICZJ3RPYmd9SBELlMZBqjoc8D1dK8wEXs2 rnug== X-Gm-Message-State: AOAM5310ntfcFpaXhJXh7ACK+A7lMM75u3XfUsODs7K5UJnRv+7yL6gr 5Q3mCiRzQ1NnZFcKPdIvlJGd8Dy5xBWZGt14pWw= X-Google-Smtp-Source: ABdhPJxK71IKMduWW2mt+NCXshKS0E6oF7WxzwUQNmcLDT/A9YHEAOZfzeyoku38PmMUvK3HNH6Eh6lXLoPNYPUF9BA= X-Received: by 2002:a17:907:7d94:: with SMTP id oz20mr7376635ejc.333.1626201657390; Tue, 13 Jul 2021 11:40:57 -0700 (PDT) MIME-Version: 1.0 References: <20210713010536.3161822-1-woodylin@google.com> In-Reply-To: <20210713010536.3161822-1-woodylin@google.com> From: Andrey Konovalov Date: Tue, 13 Jul 2021 20:40:46 +0200 Message-ID: Subject: Re: [PATCH v2] mm/kasan: move kasan.fault to mm/kasan/report.c To: Woody Lin Cc: Marco Elver , Andrey Ryabinin , Dmitry Vyukov , Alexander Potapenko , Jonathan Corbet , Andrew Morton , kasan-dev , "open list:DOCUMENTATION" , LKML , Linux Memory Management List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 13, 2021 at 3:07 AM Woody Lin wrote: > > Move the boot parameter 'kasan.fault' from hw_tags.c to report.c, so it > can support all KASAN modes - generic, and both tag-based. > > Signed-off-by: Woody Lin > --- > Documentation/dev-tools/kasan.rst | 13 ++++++---- > mm/kasan/hw_tags.c | 43 ------------------------------- > mm/kasan/kasan.h | 1 - > mm/kasan/report.c | 29 ++++++++++++++++++--- > 4 files changed, 34 insertions(+), 52 deletions(-) > > diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst > index 83ec4a556c19..21dc03bc10a4 100644 > --- a/Documentation/dev-tools/kasan.rst > +++ b/Documentation/dev-tools/kasan.rst > @@ -181,9 +181,16 @@ By default, KASAN prints a bug report only for the first invalid memory access. > With ``kasan_multi_shot``, KASAN prints a report on every invalid access. This > effectively disables ``panic_on_warn`` for KASAN reports. > > +Alternatively, independent of ``panic_on_warn`` the ``kasan.fault=`` boot > +parameter can be used to control panic and reporting behaviour: > + > +- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN > + report or also panic the kernel (default: ``report``). The panic happens even > + if ``kasan_multi_shot`` is enabled. > + > Hardware tag-based KASAN mode (see the section about various modes below) is > intended for use in production as a security mitigation. Therefore, it supports > -boot parameters that allow disabling KASAN or controlling its features. > +additional boot parameters that allow disabling KASAN or controlling features: > > - ``kasan=off`` or ``=on`` controls whether KASAN is enabled (default: ``on``). > > @@ -199,10 +206,6 @@ boot parameters that allow disabling KASAN or controlling its features. > - ``kasan.stacktrace=off`` or ``=on`` disables or enables alloc and free stack > traces collection (default: ``on``). > > -- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN > - report or also panic the kernel (default: ``report``). The panic happens even > - if ``kasan_multi_shot`` is enabled. > - > Implementation details > ---------------------- > > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 4ea8c368b5b8..51903639e55f 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -37,16 +37,9 @@ enum kasan_arg_stacktrace { > KASAN_ARG_STACKTRACE_ON, > }; > > -enum kasan_arg_fault { > - KASAN_ARG_FAULT_DEFAULT, > - KASAN_ARG_FAULT_REPORT, > - KASAN_ARG_FAULT_PANIC, > -}; > - > static enum kasan_arg kasan_arg __ro_after_init; > static enum kasan_arg_mode kasan_arg_mode __ro_after_init; > static enum kasan_arg_stacktrace kasan_arg_stacktrace __ro_after_init; > -static enum kasan_arg_fault kasan_arg_fault __ro_after_init; > > /* Whether KASAN is enabled at all. */ > DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); > @@ -59,9 +52,6 @@ EXPORT_SYMBOL_GPL(kasan_flag_async); > /* Whether to collect alloc/free stack traces. */ > DEFINE_STATIC_KEY_FALSE(kasan_flag_stacktrace); > > -/* Whether to panic or print a report and disable tag checking on fault. */ > -bool kasan_flag_panic __ro_after_init; > - > /* kasan=off/on */ > static int __init early_kasan_flag(char *arg) > { > @@ -113,23 +103,6 @@ static int __init early_kasan_flag_stacktrace(char *arg) > } > early_param("kasan.stacktrace", early_kasan_flag_stacktrace); > > -/* kasan.fault=report/panic */ > -static int __init early_kasan_fault(char *arg) > -{ > - if (!arg) > - return -EINVAL; > - > - if (!strcmp(arg, "report")) > - kasan_arg_fault = KASAN_ARG_FAULT_REPORT; > - else if (!strcmp(arg, "panic")) > - kasan_arg_fault = KASAN_ARG_FAULT_PANIC; > - else > - return -EINVAL; > - > - return 0; > -} > -early_param("kasan.fault", early_kasan_fault); > - > /* kasan_init_hw_tags_cpu() is called for each CPU. */ > void kasan_init_hw_tags_cpu(void) > { > @@ -197,22 +170,6 @@ void __init kasan_init_hw_tags(void) > break; > } > > - switch (kasan_arg_fault) { > - case KASAN_ARG_FAULT_DEFAULT: > - /* > - * Default to no panic on report. > - * Do nothing, kasan_flag_panic keeps its default value. > - */ > - break; > - case KASAN_ARG_FAULT_REPORT: > - /* Do nothing, kasan_flag_panic keeps its default value. */ > - break; > - case KASAN_ARG_FAULT_PANIC: > - /* Enable panic on report. */ > - kasan_flag_panic = true; > - break; > - } > - > pr_info("KernelAddressSanitizer initialized\n"); > } > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 98e3059bfea4..9d57383ce1fa 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -36,7 +36,6 @@ static inline bool kasan_async_mode_enabled(void) > > #endif > > -extern bool kasan_flag_panic __ro_after_init; > extern bool kasan_flag_async __ro_after_init; > > #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 8fff1825b22c..884a950c7026 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -39,6 +39,31 @@ static unsigned long kasan_flags; > #define KASAN_BIT_REPORTED 0 > #define KASAN_BIT_MULTI_SHOT 1 > > +enum kasan_arg_fault { > + KASAN_ARG_FAULT_DEFAULT, > + KASAN_ARG_FAULT_REPORT, > + KASAN_ARG_FAULT_PANIC, > +}; > + > +static enum kasan_arg_fault kasan_arg_fault __ro_after_init = KASAN_ARG_FAULT_DEFAULT; > + > +/* kasan.fault=report/panic */ > +static int __init early_kasan_fault(char *arg) > +{ > + if (!arg) > + return -EINVAL; > + > + if (!strcmp(arg, "report")) > + kasan_arg_fault = KASAN_ARG_FAULT_REPORT; > + else if (!strcmp(arg, "panic")) > + kasan_arg_fault = KASAN_ARG_FAULT_PANIC; > + else > + return -EINVAL; > + > + return 0; > +} > +early_param("kasan.fault", early_kasan_fault); > + > bool kasan_save_enable_multi_shot(void) > { > return test_and_set_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags); > @@ -102,10 +127,8 @@ static void end_report(unsigned long *flags, unsigned long addr) > panic_on_warn = 0; > panic("panic_on_warn set ...\n"); > } > -#ifdef CONFIG_KASAN_HW_TAGS > - if (kasan_flag_panic) > + if (kasan_arg_fault == KASAN_ARG_FAULT_PANIC) > panic("kasan.fault=panic set ...\n"); > -#endif > kasan_enable_current(); > } > > -- > 2.32.0.93.g670b81a890-goog > Reviewed-by: Andrey Konovalov From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B51CC07E95 for ; Tue, 13 Jul 2021 18:41:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C7BC61369 for ; Tue, 13 Jul 2021 18:41:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C7BC61369 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5203D6B008C; Tue, 13 Jul 2021 14:41:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F77E6B0095; Tue, 13 Jul 2021 14:41:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 398436B0096; Tue, 13 Jul 2021 14:41:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0132.hostedemail.com [216.40.44.132]) by kanga.kvack.org (Postfix) with ESMTP id 17EE36B008C for ; Tue, 13 Jul 2021 14:41:00 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 049431855DEFB for ; Tue, 13 Jul 2021 18:40:58 +0000 (UTC) X-FDA: 78358431438.18.481357A Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf19.hostedemail.com (Postfix) with ESMTP id BA709B0001A9 for ; Tue, 13 Jul 2021 18:40:58 +0000 (UTC) Received: by mail-ej1-f45.google.com with SMTP id ga14so28286759ejc.6 for ; Tue, 13 Jul 2021 11:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QQpf5xOaOqo0s/plb1U3NgMNZX1Ph8Dt44evAisR+l0=; b=gI7n/qI/DkL7SIT4shqKYtKHWdM176gJQ3/2RrZOVcCXPfG3EbUy0bDedEoBuILbpr CORECQF9iy1EkOD3hP9IHmXZ44XRBdjIs8sBXI2ozzNvMcmlMTmrdANT4RNAU+w8xj8G J7eUfJnhuD343zLi1dXayV9MAKCc3KSG1f9wePXJfVqfeVIb7OUS4KYYUZMd8EQxsX/H wWUc0Qhpve1BBC1OconHChBafgEAEQ27DJIul2rLsMOyDgWl4upMFHXuURFasV4lT56Y Z5LoII4Nkvv594aDEvDTbKWa51/5nk67U4dBgAYdty4lCqqvATA4epnFmJoN3qk7B6CQ S5fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QQpf5xOaOqo0s/plb1U3NgMNZX1Ph8Dt44evAisR+l0=; b=kQmY8R6F0peY/eo1+zpyRR0sFzBK3gxQMZ8G0P4U3DaGDxu/dehSozeHXG2JK9tY3q gKGtiQ7a/3mgTlLn9e+wOMDdAHR8y3b+R/IdrLGP73OZMlyXJ45icPfdfIhZKBwnazpz 3XAqT7YtOmUuHEdseprV14wY/wfgTKg7MW/GcndGwLq2B5YqU4rkyxH5vBOR8PQu6bbP DiX0ntKC11SebENPBVUHU9ZETfIMGfQ15fDWuIkko7LDTdJKGtP029vVmgguYBfVuKSb Jq/8990QtOMCwM06BGKOr9/cyUvwxMaayz9WCXI5fERTxLW32w2V19ULzRDjni32j1Pw 5qjA== X-Gm-Message-State: AOAM532JhetsT4QD3KQLhauU3PD8rmUSzTdAJEGUrsBq+AM5/Ud+tR5G Bsn055zSRgkNuThu7NuIBA8vpo8HlmxISBETwGA= X-Google-Smtp-Source: ABdhPJxK71IKMduWW2mt+NCXshKS0E6oF7WxzwUQNmcLDT/A9YHEAOZfzeyoku38PmMUvK3HNH6Eh6lXLoPNYPUF9BA= X-Received: by 2002:a17:907:7d94:: with SMTP id oz20mr7376635ejc.333.1626201657390; Tue, 13 Jul 2021 11:40:57 -0700 (PDT) MIME-Version: 1.0 References: <20210713010536.3161822-1-woodylin@google.com> In-Reply-To: <20210713010536.3161822-1-woodylin@google.com> From: Andrey Konovalov Date: Tue, 13 Jul 2021 20:40:46 +0200 Message-ID: Subject: Re: [PATCH v2] mm/kasan: move kasan.fault to mm/kasan/report.c To: Woody Lin Cc: Marco Elver , Andrey Ryabinin , Dmitry Vyukov , Alexander Potapenko , Jonathan Corbet , Andrew Morton , kasan-dev , "open list:DOCUMENTATION" , LKML , Linux Memory Management List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BA709B0001A9 X-Stat-Signature: 3c46398dns5txsep1hnb1qg43y1iqnah Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="gI7n/qI/"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com X-HE-Tag: 1626201658-752602 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: On Tue, Jul 13, 2021 at 3:07 AM Woody Lin wrote: > > Move the boot parameter 'kasan.fault' from hw_tags.c to report.c, so it > can support all KASAN modes - generic, and both tag-based. > > Signed-off-by: Woody Lin > --- > Documentation/dev-tools/kasan.rst | 13 ++++++---- > mm/kasan/hw_tags.c | 43 ------------------------------- > mm/kasan/kasan.h | 1 - > mm/kasan/report.c | 29 ++++++++++++++++++--- > 4 files changed, 34 insertions(+), 52 deletions(-) > > diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst > index 83ec4a556c19..21dc03bc10a4 100644 > --- a/Documentation/dev-tools/kasan.rst > +++ b/Documentation/dev-tools/kasan.rst > @@ -181,9 +181,16 @@ By default, KASAN prints a bug report only for the first invalid memory access. > With ``kasan_multi_shot``, KASAN prints a report on every invalid access. This > effectively disables ``panic_on_warn`` for KASAN reports. > > +Alternatively, independent of ``panic_on_warn`` the ``kasan.fault=`` boot > +parameter can be used to control panic and reporting behaviour: > + > +- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN > + report or also panic the kernel (default: ``report``). The panic happens even > + if ``kasan_multi_shot`` is enabled. > + > Hardware tag-based KASAN mode (see the section about various modes below) is > intended for use in production as a security mitigation. Therefore, it supports > -boot parameters that allow disabling KASAN or controlling its features. > +additional boot parameters that allow disabling KASAN or controlling features: > > - ``kasan=off`` or ``=on`` controls whether KASAN is enabled (default: ``on``). > > @@ -199,10 +206,6 @@ boot parameters that allow disabling KASAN or controlling its features. > - ``kasan.stacktrace=off`` or ``=on`` disables or enables alloc and free stack > traces collection (default: ``on``). > > -- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN > - report or also panic the kernel (default: ``report``). The panic happens even > - if ``kasan_multi_shot`` is enabled. > - > Implementation details > ---------------------- > > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 4ea8c368b5b8..51903639e55f 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -37,16 +37,9 @@ enum kasan_arg_stacktrace { > KASAN_ARG_STACKTRACE_ON, > }; > > -enum kasan_arg_fault { > - KASAN_ARG_FAULT_DEFAULT, > - KASAN_ARG_FAULT_REPORT, > - KASAN_ARG_FAULT_PANIC, > -}; > - > static enum kasan_arg kasan_arg __ro_after_init; > static enum kasan_arg_mode kasan_arg_mode __ro_after_init; > static enum kasan_arg_stacktrace kasan_arg_stacktrace __ro_after_init; > -static enum kasan_arg_fault kasan_arg_fault __ro_after_init; > > /* Whether KASAN is enabled at all. */ > DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); > @@ -59,9 +52,6 @@ EXPORT_SYMBOL_GPL(kasan_flag_async); > /* Whether to collect alloc/free stack traces. */ > DEFINE_STATIC_KEY_FALSE(kasan_flag_stacktrace); > > -/* Whether to panic or print a report and disable tag checking on fault. */ > -bool kasan_flag_panic __ro_after_init; > - > /* kasan=off/on */ > static int __init early_kasan_flag(char *arg) > { > @@ -113,23 +103,6 @@ static int __init early_kasan_flag_stacktrace(char *arg) > } > early_param("kasan.stacktrace", early_kasan_flag_stacktrace); > > -/* kasan.fault=report/panic */ > -static int __init early_kasan_fault(char *arg) > -{ > - if (!arg) > - return -EINVAL; > - > - if (!strcmp(arg, "report")) > - kasan_arg_fault = KASAN_ARG_FAULT_REPORT; > - else if (!strcmp(arg, "panic")) > - kasan_arg_fault = KASAN_ARG_FAULT_PANIC; > - else > - return -EINVAL; > - > - return 0; > -} > -early_param("kasan.fault", early_kasan_fault); > - > /* kasan_init_hw_tags_cpu() is called for each CPU. */ > void kasan_init_hw_tags_cpu(void) > { > @@ -197,22 +170,6 @@ void __init kasan_init_hw_tags(void) > break; > } > > - switch (kasan_arg_fault) { > - case KASAN_ARG_FAULT_DEFAULT: > - /* > - * Default to no panic on report. > - * Do nothing, kasan_flag_panic keeps its default value. > - */ > - break; > - case KASAN_ARG_FAULT_REPORT: > - /* Do nothing, kasan_flag_panic keeps its default value. */ > - break; > - case KASAN_ARG_FAULT_PANIC: > - /* Enable panic on report. */ > - kasan_flag_panic = true; > - break; > - } > - > pr_info("KernelAddressSanitizer initialized\n"); > } > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 98e3059bfea4..9d57383ce1fa 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -36,7 +36,6 @@ static inline bool kasan_async_mode_enabled(void) > > #endif > > -extern bool kasan_flag_panic __ro_after_init; > extern bool kasan_flag_async __ro_after_init; > > #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 8fff1825b22c..884a950c7026 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -39,6 +39,31 @@ static unsigned long kasan_flags; > #define KASAN_BIT_REPORTED 0 > #define KASAN_BIT_MULTI_SHOT 1 > > +enum kasan_arg_fault { > + KASAN_ARG_FAULT_DEFAULT, > + KASAN_ARG_FAULT_REPORT, > + KASAN_ARG_FAULT_PANIC, > +}; > + > +static enum kasan_arg_fault kasan_arg_fault __ro_after_init = KASAN_ARG_FAULT_DEFAULT; > + > +/* kasan.fault=report/panic */ > +static int __init early_kasan_fault(char *arg) > +{ > + if (!arg) > + return -EINVAL; > + > + if (!strcmp(arg, "report")) > + kasan_arg_fault = KASAN_ARG_FAULT_REPORT; > + else if (!strcmp(arg, "panic")) > + kasan_arg_fault = KASAN_ARG_FAULT_PANIC; > + else > + return -EINVAL; > + > + return 0; > +} > +early_param("kasan.fault", early_kasan_fault); > + > bool kasan_save_enable_multi_shot(void) > { > return test_and_set_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags); > @@ -102,10 +127,8 @@ static void end_report(unsigned long *flags, unsigned long addr) > panic_on_warn = 0; > panic("panic_on_warn set ...\n"); > } > -#ifdef CONFIG_KASAN_HW_TAGS > - if (kasan_flag_panic) > + if (kasan_arg_fault == KASAN_ARG_FAULT_PANIC) > panic("kasan.fault=panic set ...\n"); > -#endif > kasan_enable_current(); > } > > -- > 2.32.0.93.g670b81a890-goog > Reviewed-by: Andrey Konovalov