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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 2A03CC83D59 for ; Mon, 16 Nov 2020 12:38:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE08220855 for ; Mon, 16 Nov 2020 12:38:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pt6jcPm5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729777AbgKPLuO (ORCPT ); Mon, 16 Nov 2020 06:50:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726487AbgKPLuN (ORCPT ); Mon, 16 Nov 2020 06:50:13 -0500 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 940E0C0613CF for ; Mon, 16 Nov 2020 03:50:12 -0800 (PST) Received: by mail-ot1-x342.google.com with SMTP id n11so15728487ota.2 for ; Mon, 16 Nov 2020 03:50:12 -0800 (PST) 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=fu3D6i8J61m+Cc7UW0OMX7Lqixc5Ynk1q+2LnV9wne0=; b=Pt6jcPm5dU+criPa9cicLUvdCVAqkzUHWd1Hci2dnjSRsBYRh/3+LAWeXMACgDyzfp X3VUJwro+hrGzVw+o5UzM8N8RHFFzHbYdGfQSYa/g7pXlgTE6ueKXT1FOiqLTMq3pKDS fROvtumY/Iroc0+exJFyugUD6zfyWkaQxe5B67uhHV+0939l3i25Kx8psdW0paPFgxj3 +T6P7CsedKrkcbSEBlZm2Go3sn3Uj+/WQk8Dx2FZ3qP5pmVMWZPZcJ9nCBZ/pN3L6iwN Y3ifA2JEguHbkSj6IeHkqk8IuKpu/B7/J9SOkZLacD9Qy8Yoo/CFykmmLOvoyZHFT6eq gWIg== 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=fu3D6i8J61m+Cc7UW0OMX7Lqixc5Ynk1q+2LnV9wne0=; b=NI1f4lr9AUv73fXJWMCP09Div75Y95XmYE/fZWGi+eG4WxAK6bb1WNHCvk3kOPfuKh gjTBbN17UFPHmRmK75OrIWLC8d2Tqx4Fj0/FUyOHs19KnSQMOcikYAviJpUXYmnvINk4 qXGxDPwzg+0PEc0vggYrB8tPF/10jNoQoW4C1nXSaBTsRiOYGO2G4GqGdj9dlBeDyxLx MYWwKYH/1tBQFEwIry3G2dx6bSzDeOi4BVaRSM65RBb2tkdL/PMG/LJelOP3GdPhmOjc ifbVBhesQ+vU1KoP3rjWoWiPY6PmAFQhusn23p2+BK/Hv8LziXin2BEYCaIi2Sg7rkxY lBMw== X-Gm-Message-State: AOAM53041dBfq9mnw77hnsR+B05XEclRWYtpqX8jkwS80MoJflcikf9o 54P/lL7cJh+UbRnzuxqIzkWAogAJzQryFbQ29oBljA== X-Google-Smtp-Source: ABdhPJz+UfTC8SjYm5XUzWC/G5ezY99GyqEI1qyVjf0RgCbCLEZvZQHFilyUs1hAtjFkctLuRk+6KIoRr8s/aujSQ1g= X-Received: by 2002:a9d:69:: with SMTP id 96mr6596676ota.233.1605527411731; Mon, 16 Nov 2020 03:50:11 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Marco Elver Date: Mon, 16 Nov 2020 12:50:00 +0100 Message-ID: Subject: Re: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK To: Dmitry Vyukov Cc: Andrey Konovalov , Catalin Marinas , Will Deacon , Vincenzo Frascino , Alexander Potapenko , Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux-MM , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)) \ ...