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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 9049BC8B4C5 for ; Mon, 16 Nov 2020 12:42:55 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 2768F2137B for ; Mon, 16 Nov 2020 12:42:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1HC4YXvN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2768F2137B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EA1wua1P8BvH5XEdATu1yKz+qw5zyd0gV3T9Hu6ip7E=; b=1HC4YXvNSujj8Xg6BwMxVfeZQ rJ67RPgVDhdX2uHpU3zYUep+IvcTJ5Bc+tRtrNTP2Q1PeN73L3Im/ER8u9vXNDihNEeW909vrzYbc xmD9ANqM+VI82SBvsOWbU5rbQOhwBdpGqjK+HPgFEI2eI/R0SCL2xEbaM1noOvXMs88aCI5NKkJ3C zxcHZP8hjDQhmRfjAzLlCuC1UEvS5iTlWfrstJvG9ym42UWIk9CLNgMyJ/rJu6ec+5I8RZNlWAIBo slXl9EOCQE1TijDw4Sj0Mt+5FehQv21mmFBMoAoR/uam03tT7C7BklzpBWsjQNTn7PhQxiXmwbTSX zdQHooMjg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedpz-0002AD-Gg; Mon, 16 Nov 2020 12:42:27 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedpw-00028t-49 for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 12:42:25 +0000 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 DC39B101E; Mon, 16 Nov 2020 04:42:16 -0800 (PST) Received: from [10.37.12.42] (unknown [10.37.12.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 003023F70D; Mon, 16 Nov 2020 04:42:12 -0800 (PST) Subject: Re: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK To: Dmitry Vyukov , Catalin Marinas References: From: Vincenzo Frascino Message-ID: <9d4156e6-ec4f-a742-a44e-f38bf7fa9ba9@arm.com> Date: Mon, 16 Nov 2020 12:45:19 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_074224_273865_B4980418 X-CRM114-Status: GOOD ( 23.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Linux-MM , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Peter Collingbourne , Evgenii Stepanov 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 11/16/20 12:19 PM, Dmitry Vyukov wrote: > On Mon, Nov 16, 2020 at 1:16 PM Catalin Marinas wrote: >> >> On Mon, Nov 16, 2020 at 12:50:00PM +0100, Marco Elver wrote: >>> On Mon, 16 Nov 2020 at 11:59, Dmitry Vyukov wrote: >>>> On Thu, Oct 29, 2020 at 8:57 PM 'Andrey Konovalov' via kasan-dev >>>> wrote: >>>>> On Tue, Oct 27, 2020 at 1:44 PM Dmitry Vyukov wrote: >>>>>> >>>>>> On Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov wrote: >>>>>>> >>>>>>> There's a config option CONFIG_KASAN_STACK that has to be enabled for >>>>>>> KASAN to use stack instrumentation and perform validity checks for >>>>>>> stack variables. >>>>>>> >>>>>>> There's no need to unpoison stack when CONFIG_KASAN_STACK is not enabled. >>>>>>> Only call kasan_unpoison_task_stack[_below]() when CONFIG_KASAN_STACK is >>>>>>> enabled. >>>>>>> >>>>>>> Signed-off-by: Andrey Konovalov >>>>>>> Link: https://linux-review.googlesource.com/id/If8a891e9fe01ea543e00b576852685afec0887e3 >>>>>>> --- >>>>>>> arch/arm64/kernel/sleep.S | 2 +- >>>>>>> arch/x86/kernel/acpi/wakeup_64.S | 2 +- >>>>>>> include/linux/kasan.h | 10 ++++++---- >>>>>>> mm/kasan/common.c | 2 ++ >>>>>>> 4 files changed, 10 insertions(+), 6 deletions(-) >>>>>>> >>>>>>> diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S >>>>>>> index ba40d57757d6..bdadfa56b40e 100644 >>>>>>> --- a/arch/arm64/kernel/sleep.S >>>>>>> +++ b/arch/arm64/kernel/sleep.S >>>>>>> @@ -133,7 +133,7 @@ SYM_FUNC_START(_cpu_resume) >>>>>>> */ >>>>>>> bl cpu_do_resume >>>>>>> >>>>>>> -#ifdef CONFIG_KASAN >>>>>>> +#if defined(CONFIG_KASAN) && 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 c8daa92f38dc..5d3a0b8fd379 100644 >>>>>>> --- a/arch/x86/kernel/acpi/wakeup_64.S >>>>>>> +++ b/arch/x86/kernel/acpi/wakeup_64.S >>>>>>> @@ -112,7 +112,7 @@ SYM_FUNC_START(do_suspend_lowlevel) >>>>>>> movq pt_regs_r14(%rax), %r14 >>>>>>> movq pt_regs_r15(%rax), %r15 >>>>>>> >>>>>>> -#ifdef CONFIG_KASAN >>>>>>> +#if defined(CONFIG_KASAN) && 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 3f3f541e5d5f..7be9fb9146ac 100644 >>>>>>> --- a/include/linux/kasan.h >>>>>>> +++ b/include/linux/kasan.h >>>>>>> @@ -68,8 +68,6 @@ static inline void kasan_disable_current(void) {} >>>>>>> >>>>>>> void kasan_unpoison_memory(const void *address, size_t size); >>>>>>> >>>>>>> -void kasan_unpoison_task_stack(struct task_struct *task); >>>>>>> - >>>>>>> void kasan_alloc_pages(struct page *page, unsigned int order); >>>>>>> void kasan_free_pages(struct page *page, unsigned int order); >>>>>>> >>>>>>> @@ -114,8 +112,6 @@ void kasan_restore_multi_shot(bool enabled); >>>>>>> >>>>>>> static inline void kasan_unpoison_memory(const void *address, size_t size) {} >>>>>>> >>>>>>> -static inline void kasan_unpoison_task_stack(struct task_struct *task) {} >>>>>>> - >>>>>>> static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} >>>>>>> static inline void kasan_free_pages(struct page *page, unsigned int order) {} >>>>>>> >>>>>>> @@ -167,6 +163,12 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } >>>>>>> >>>>>>> #endif /* CONFIG_KASAN */ >>>>>>> >>>>>>> +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK >>>>>> >>>>>> && defined(CONFIG_KASAN_STACK) for consistency >>>>> >>>>> CONFIG_KASAN_STACK is different from other KASAN configs. It's always >>>>> defined, and its value is what controls whether stack instrumentation >>>>> is enabled. >>>> >>>> Not sure why we did this instead of the following, but okay. >>>> >>>> config KASAN_STACK >>>> - int >>>> - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC >>>> - default 0 >>>> + bool >>>> + default y if KASAN_STACK_ENABLE || CC_IS_GCC >>>> + default n >>> >>> I wondered the same, but then looking at scripts/Makefile.kasan I >>> think it's because we directly pass it to the compiler: >>> ... >>> $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ >>> ... >> >> Try this instead: >> >> $(call cc-param,asan-stack=$(if $(CONFIG_KASAN_STACK),1,0)) \ > > > We could have just 1 config instead of 2 as well. > For gcc we could do no prompt and default value y, and for clang -- > prompt and default value n. I think it should do what we need. > I agree with Catalin's proposal since it should simplify things. Nit: 'default n' is the default hence I do not think it should be required explicitly. -- Regards, Vincenzo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel