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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 5BD02C433DB for ; Mon, 29 Mar 2021 23:00:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD8E161934 for ; Mon, 29 Mar 2021 23:00:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD8E161934 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6+S5+WlDbsOU4MQdxBxNcNdrbAlDuAP4uXB4K9NsejA=; b=gMbyDrtBFrDvDKCMHajyYWw8F KYW2es4g/N6jetY5MD0PRx87tWd5XlySav50itdXwhtRczHu7qYqg5z9fhZTv47lVqzcpjmYJoYtw fp13g6M4bqZ1rOYzcvl9iZGhv5L70IAFObSUEPdovw5v6PJXE2fyL7bf1b0/M4DzWXwD0U73sW9AL yOIGDrsV8B8mnbm/ULfWkObRCpXoOPZ+HTZJ+aJ/qmd/J540ewTHEHdioY/DN4qyaw20XNIq4FF/x L8yLc0JLXsZwqwyRbVMsF2NCuCNg07duJrL4cQTvW7xTHmjY6Wgq7Ll8noFVE/LMQYWHALQEGmZz+ tZK6rfHkA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lR0p4-001nRQ-AU; Mon, 29 Mar 2021 22:57:26 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lQtHt-000ipd-Al for linux-arm-kernel@lists.infradead.org; Mon, 29 Mar 2021 14:54:51 +0000 Received: by mail-pg1-x534.google.com with SMTP id y32so8420494pga.11 for ; Mon, 29 Mar 2021 07:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5MEBgMlFtr+qxbmpKO8IW3rS99OFMlWLKykyxAuuxkw=; b=iSXU1lHcTUj38J05Z9GV3nilDz0wRKt476JZoxbOrRSXRik4PcbqdzYYeizLtVJCNY sNQuslsEuyQ+XvlSULwLKyM5SNpTDb+IQf44HVuPfuYF+Hf4g/UhPkxgU47vp42B075o kSXlNLW0Jtyl+JpT3lE0f3ZT5GXevf5Mhqgxkj22S8EvOwzwU1iWALW5gD/xxxWXnnnk C0UeWW5kA2Qq6A4UOaY+OFnBLd5rQT/vMrD59FriEiw7FmpwVUq2H9iHYvII6vFLCDuz NpI2Nmh3L7jVUVNzBi9hY0iSdHshQ0PtAkfriQhzpTMMx6x4nPxhjVlDXV4GanaBEX5v NUfg== 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=5MEBgMlFtr+qxbmpKO8IW3rS99OFMlWLKykyxAuuxkw=; b=PKxass74gLh5eaqs1qhu+jYKdilyMdbuFYH4R2YHMnsWBakjfER0SCPPZz5B6qmM4Y WKJAHKkwiFgA++DxUjcZEtZlJVzmuZlkfAlL2Oa6F8rVl6GWTlALDL1QS3K8XB0SxfGg 2Goz20WUHkmo7sn+mseQFXgLVGeHfjejnPnjpcBz2yTh1XzLoxvpgKQxeL/pU3tWu7rL Fc/O36hTZRnZ6SRbPV8JJcRaycKaCKwfhRXFfKWDju/8cGQ452YktoXr8uvK4x52A5nu AF34CdsGPsJY9Gs0q7XUtJOhzEDQFy64HIt7vXQnIr3TH0oXQVIGtzteiWIy4SJ5/vGa cKBA== X-Gm-Message-State: AOAM532jK8FuiRrUyCKz4ILk1gXH951el+ljwHADZR2kQq1j7D/ow+lI MGbThoIZ29K065+Yz0JkwPKBMieVHz1/AhjCE8tAXg== X-Google-Smtp-Source: ABdhPJzzV8lmH/853u2GQr5Sdz0U+AIsZJ78rGGmOSXdGUQCGk3zpC0zStZZ2upiaJ1Nge2MqpdgwsXK218jh4upu8o= X-Received: by 2002:a63:d841:: with SMTP id k1mr9886568pgj.440.1617029678142; Mon, 29 Mar 2021 07:54:38 -0700 (PDT) MIME-Version: 1.0 References: <20210226012531.29231-1-walter-zh.wu@mediatek.com> In-Reply-To: <20210226012531.29231-1-walter-zh.wu@mediatek.com> From: Andrey Konovalov Date: Mon, 29 Mar 2021 16:54:26 +0200 Message-ID: Subject: Re: [PATCH v4] kasan: remove redundant config option To: Andrew Morton Cc: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Nathan Chancellor , Arnd Bergmann , kasan-dev , Linux Memory Management List , LKML , Linux ARM , wsd_upstream , "moderated list:ARM/Mediatek SoC..." , Walter Wu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210329_155449_924572_3E21F0FD X-CRM114-Status: GOOD ( 37.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Feb 26, 2021 at 2:25 AM Walter Wu wrote: > > CONFIG_KASAN_STACK and CONFIG_KASAN_STACK_ENABLE both enable KASAN stack > instrumentation, but we should only need one config, so that we remove > CONFIG_KASAN_STACK_ENABLE and make CONFIG_KASAN_STACK workable. see [1]. > > When enable KASAN stack instrumentation, then for gcc we could do no > prompt and default value y, and for clang prompt and default value n. > > [1]: https://bugzilla.kernel.org/show_bug.cgi?id=210221 > > Signed-off-by: Walter Wu > Suggested-by: Dmitry Vyukov > Reviewed-by: Nathan Chancellor > Acked-by: Arnd Bergmann > Reviewed-by: Andrey Konovalov > Cc: Andrey Ryabinin > Cc: Dmitry Vyukov > Cc: Alexander Potapenko > Cc: Andrew Morton > --- > > v4: After this patch sent, someone had modification about KASAN_STACK, > so I need to rebase codebase. Thank Andrey for your pointing. > > --- > arch/arm64/kernel/sleep.S | 2 +- > arch/x86/kernel/acpi/wakeup_64.S | 2 +- > include/linux/kasan.h | 2 +- > lib/Kconfig.kasan | 8 ++------ > mm/kasan/common.c | 2 +- > mm/kasan/kasan.h | 2 +- > mm/kasan/report_generic.c | 2 +- > scripts/Makefile.kasan | 10 ++++++++-- > security/Kconfig.hardening | 4 ++-- > 9 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S > index 5bfd9b87f85d..4ea9392f86e0 100644 > --- a/arch/arm64/kernel/sleep.S > +++ b/arch/arm64/kernel/sleep.S > @@ -134,7 +134,7 @@ SYM_FUNC_START(_cpu_resume) > */ > bl cpu_do_resume > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > mov x0, sp > bl kasan_unpoison_task_stack_below > #endif > diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S > index 56b6865afb2a..d5d8a352eafa 100644 > --- a/arch/x86/kernel/acpi/wakeup_64.S > +++ b/arch/x86/kernel/acpi/wakeup_64.S > @@ -115,7 +115,7 @@ SYM_FUNC_START(do_suspend_lowlevel) > movq pt_regs_r14(%rax), %r14 > movq pt_regs_r15(%rax), %r15 > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > /* > * The suspend path may have poisoned some areas deeper in the stack, > * which we now need to unpoison. > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index b91732bd05d7..14f72ec96492 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -330,7 +330,7 @@ static inline bool kasan_check_byte(const void *address) > > #endif /* CONFIG_KASAN */ > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > void kasan_unpoison_task_stack(struct task_struct *task); > #else > static inline void kasan_unpoison_task_stack(struct task_struct *task) {} > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index 624ae1df7984..cffc2ebbf185 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -138,9 +138,10 @@ config KASAN_INLINE > > endchoice > > -config KASAN_STACK_ENABLE > +config KASAN_STACK > bool "Enable stack instrumentation (unsafe)" if CC_IS_CLANG && !COMPILE_TEST > depends on KASAN_GENERIC || KASAN_SW_TAGS > + default y if CC_IS_GCC > help > The LLVM stack address sanitizer has a know problem that > causes excessive stack usage in a lot of functions, see > @@ -154,11 +155,6 @@ config KASAN_STACK_ENABLE > CONFIG_COMPILE_TEST. On gcc it is assumed to always be safe > to use and enabled by default. > > -config KASAN_STACK > - int > - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC > - default 0 > - > config KASAN_SW_TAGS_IDENTIFY > bool "Enable memory corruption identification" > depends on KASAN_SW_TAGS > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index b5e08d4cefec..7b53291dafa1 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -63,7 +63,7 @@ void __kasan_unpoison_range(const void *address, size_t size) > kasan_unpoison(address, size); > } > > -#if CONFIG_KASAN_STACK > +#ifdef CONFIG_KASAN_STACK > /* Unpoison the entire stack for a task. */ > void kasan_unpoison_task_stack(struct task_struct *task) > { > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 8c55634d6edd..3436c6bf7c0c 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -231,7 +231,7 @@ void *kasan_find_first_bad_addr(void *addr, size_t size); > const char *kasan_get_bug_type(struct kasan_access_info *info); > void kasan_metadata_fetch_row(char *buffer, void *row); > > -#if defined(CONFIG_KASAN_GENERIC) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN_GENERIC) && defined(CONFIG_KASAN_STACK) > void kasan_print_address_stack_frame(const void *addr); > #else > static inline void kasan_print_address_stack_frame(const void *addr) { } > diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c > index 41f374585144..de732bc341c5 100644 > --- a/mm/kasan/report_generic.c > +++ b/mm/kasan/report_generic.c > @@ -128,7 +128,7 @@ void kasan_metadata_fetch_row(char *buffer, void *row) > memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW); > } > > -#if CONFIG_KASAN_STACK > +#ifdef CONFIG_KASAN_STACK > static bool __must_check tokenize_frame_descr(const char **frame_descr, > char *token, size_t max_tok_len, > unsigned long *value) > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > index 1e000cc2e7b4..abf231d209b1 100644 > --- a/scripts/Makefile.kasan > +++ b/scripts/Makefile.kasan > @@ -2,6 +2,12 @@ > CFLAGS_KASAN_NOSANITIZE := -fno-builtin > KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > > +ifdef CONFIG_KASAN_STACK > + stack_enable := 1 > +else > + stack_enable := 0 > +endif > + > ifdef CONFIG_KASAN_GENERIC > > ifdef CONFIG_KASAN_INLINE > @@ -27,7 +33,7 @@ else > CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \ > $(call cc-param,asan-globals=1) \ > $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ > - $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ > + $(call cc-param,asan-stack=$(stack_enable)) \ > $(call cc-param,asan-instrument-allocas=1) > endif > > @@ -42,7 +48,7 @@ else > endif > > CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ > - -mllvm -hwasan-instrument-stack=$(CONFIG_KASAN_STACK) \ > + -mllvm -hwasan-instrument-stack=$(stack_enable) \ > -mllvm -hwasan-use-short-granules=0 \ > $(instrumentation_flags) > > diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening > index 269967c4fc1b..a56c36470cb1 100644 > --- a/security/Kconfig.hardening > +++ b/security/Kconfig.hardening > @@ -64,7 +64,7 @@ choice > config GCC_PLUGIN_STRUCTLEAK_BYREF > bool "zero-init structs passed by reference (strong)" > depends on GCC_PLUGINS > - depends on !(KASAN && KASAN_STACK=1) > + depends on !(KASAN && KASAN_STACK) > select GCC_PLUGIN_STRUCTLEAK > help > Zero-initialize any structures on the stack that may > @@ -82,7 +82,7 @@ choice > config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL > bool "zero-init anything passed by reference (very strong)" > depends on GCC_PLUGINS > - depends on !(KASAN && KASAN_STACK=1) > + depends on !(KASAN && KASAN_STACK) > select GCC_PLUGIN_STRUCTLEAK > help > Zero-initialize any stack variables that may be passed > -- > 2.18.0 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20210226012531.29231-1-walter-zh.wu%40mediatek.com. Hi Andrew, Looks like my patch "kasan: fix KASAN_STACK dependency for HW_TAGS" that was merged into 5.12-rc causes a build time warning: include/linux/kasan.h:333:30: warning: 'CONFIG_KASAN_STACK' is not defined, evaluates to 0 [-Wundef] #if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK The fix for it would either be reverting the patch (which would leave the initial issue unfixed) or applying this "kasan: remove redundant config option" patch. Would it be possible to send this patch (with the fix-up you have in mm) for the next 5.12-rc? Here are the required tags: Fixes: d9b571c885a8 ("kasan: fix KASAN_STACK dependency for HW_TAGS") Cc: stable@vger.kernel.org Thanks! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel