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 91A00C5519F for ; Mon, 16 Nov 2020 12:29:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 449302224B for ; Mon, 16 Nov 2020 12:29:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gZ4lBG2f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729216AbgKPK7l (ORCPT ); Mon, 16 Nov 2020 05:59:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726710AbgKPK7l (ORCPT ); Mon, 16 Nov 2020 05:59:41 -0500 Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27350C0613CF for ; Mon, 16 Nov 2020 02:59:41 -0800 (PST) Received: by mail-qt1-x842.google.com with SMTP id 3so12546549qtx.3 for ; Mon, 16 Nov 2020 02:59:41 -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=w2fKHHmUBTp3QBPbH39v+ua/WX4NZLnRZytlRMmRIjc=; b=gZ4lBG2fLiRggX8aU3Y735M5w8ithrBeYR1RMxMWAspT1nrsIO9Zg5xxlApTuWvn1U nES/ZecDWNZyh1BuU6ePxlEB3xUOquA+uSDYYzj2bD4VIx2Px/JKnUVt6Dk3jNa4w50s cBjh95caTOMLtlWiq8llOzgyBMmKwdqsjscQkWJXO98uoY7Q6Lx6cWBmZZojm8gDPu+M QJ4hH+Yr3ot/u64KygN3+1nMr1aW4D41DSHeU6d8QMLazqEzw0gVqxrvtjYNr8XqTK7N jQ8YC87FWN1n/reHNlo82ogb5sFVWiSGb2f+TB6F7CoV412TJ30bSRWUahycmas0AhcE jftA== 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=w2fKHHmUBTp3QBPbH39v+ua/WX4NZLnRZytlRMmRIjc=; b=kNwOZUt9Z9Obt4v6TZWPuRUMfblXM1ST1vTYHnLl1QH7mS2DMvUeJpD8C12XRSBYGX qVvYHu5PSkeGXOYtutL5x/9YFU6HatGq3AF94jaKTQaNOYpa/Wx0Veu6Aqx2q+s+KgF4 yPhPywqss3ckxwD5GoZ+7AHPJafGmyyaXJ3A8Buf0NXkkTzkMkFqepWy6TkC0WvvGuBL rC7WLkysC7uN25eyOSjEr/hppM89G3/DPgVj7wkHjKZTs5RfhpWM1XpvsnJwQ7bVsQnn sWVWVmGVNhf+1QzLaZZwGHieFIjspKo2L/adz3xQWgjn3WjhS1EMeZJFVGFdBAOzhYRg 7oDg== X-Gm-Message-State: AOAM532VGVk1vucra7a4oulKbR0iYumSI4S6WzGKU4zqX3SZXc1z6tvI 0SW4i5qWu6mwuJoVW14GpIVDUzh1uE29/73YbLf4Iw== X-Google-Smtp-Source: ABdhPJwWY3+kd6v17X4xZ+1bVQCpPFzoudy9ZL/aHamRr49rTthClU7ec0PQSoiPb8XAvzUwdPVDF4PsQPK0f7VtTW0= X-Received: by 2002:ac8:c04:: with SMTP id k4mr14023201qti.66.1605524379709; Mon, 16 Nov 2020 02:59:39 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Mon, 16 Nov 2020 11:59:28 +0100 Message-ID: Subject: Re: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Alexander Potapenko , Marco Elver , 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 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