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=ham 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 9E368C55178 for ; Tue, 27 Oct 2020 12:44:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 03E8C20757 for ; Tue, 27 Oct 2020 12:44:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SZkHXu8h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03E8C20757 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6CA096B0062; Tue, 27 Oct 2020 08:44:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67C9B6B0070; Tue, 27 Oct 2020 08:44:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 569476B0071; Tue, 27 Oct 2020 08:44:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id 2866D6B0062 for ; Tue, 27 Oct 2020 08:44:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AB15282499A8 for ; Tue, 27 Oct 2020 12:44:34 +0000 (UTC) X-FDA: 77417674068.28.net37_2f0598e2727c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 870166C3E for ; Tue, 27 Oct 2020 12:44:34 +0000 (UTC) X-HE-Tag: net37_2f0598e2727c X-Filterd-Recvd-Size: 7461 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Tue, 27 Oct 2020 12:44:34 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id 188so921428qkk.12 for ; Tue, 27 Oct 2020 05:44:33 -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=MOEEMcwz+wOCi9BVmbcGJ1vQkzTsdFXXOfPV2diYyTk=; b=SZkHXu8h3EbHH8VtHFgHa8YSVtI8rlRYExnbQhnfyyYBCthfOoGxvqz0E/yMDoUuRW VapDNHEwmX/cOcZIM5C7y3L6erFugKiVAz9wtT/PhTrugbUwhbR35OZ2ypo8omGUgiRk 8k6HtGR6KVlnsnMUwKciKJGsRRJjdaRj6HroxhUneaEHvHsENGd6Fji5L8jCbR2xRKgq HWhqI7MvIZH3GfnP9uXJvh+PjfXojYFr/su3BR89abRB62VPPFofWza27Fyy500xhBTp 0AAPshb5YzZNlPaD9suuA6x8hSDtp/oZP5RTRlKFyDk2sQRXwyv5asGHXi2pSY/Zqf8h laqg== 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=MOEEMcwz+wOCi9BVmbcGJ1vQkzTsdFXXOfPV2diYyTk=; b=QVhRMT4WhKUqKpXUNATa/j8NTOCBfy3Q0PYMHCUZQBXCdlTNVdMkQgYw8bQ8HuIFko lFBUQWRQe1d78jGQkdbkbnRc3EHKzN5cgWTMEXZg2QVPrcJaI5/sm+Pj4ay6ktNjcivi YlH3NyObub0P6t+0OlELurjl2YdaoBgcXsxunePJ/Y7eHXUqIOfMJRpYD+2kagYWIICC gybp9VQTjjryTGXtlL2ranDk+GZ9H7kGuQzdAjgQ7nevM9Fh0hDnEjijaLSG6sEbFQrZ KDyoUZbSA7apbKWFW+pubjgyfbx7zJK/kDqVMu0N0j8Rkr6kwEizJst3+ld0YM3LjGK+ Ym3g== X-Gm-Message-State: AOAM532P6y8Wz9bGX0WX2vIUjjjIYqH8R4e35hCp7ZkFJmYTq8Sj1Vpc xSCFyIz+HzNgTJftod9rXmcx4100F+M00MXS8Y1B4Q== X-Google-Smtp-Source: ABdhPJx+Lvo6IRixu35Gi+oFg35TIGbuidBJCx4l+BJ8meN9LeiD7vrHedNkPakIK35QGEFDWRTJcE6aA1GSTNBOUHA= X-Received: by 2002:a05:620a:1657:: with SMTP id c23mr1953011qko.231.1603802673106; Tue, 27 Oct 2020 05:44:33 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Tue, 27 Oct 2020 13:44:22 +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" 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 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 > +void kasan_unpoison_task_stack(struct task_struct *task); > +#else > +static inline void kasan_unpoison_task_stack(struct task_struct *task) {} > +#endif > + > #ifdef CONFIG_KASAN_GENERIC > > void kasan_cache_shrink(struct kmem_cache *cache); > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index a880e5a547ed..a3e67d49b893 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -58,6 +58,7 @@ void kasan_disable_current(void) > } > #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > > +#if CONFIG_KASAN_STACK #ifdef CONFIG_ is the form used toughout the kernel code > static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) > { > void *base = task_stack_page(task); > @@ -84,6 +85,7 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) > > kasan_unpoison_memory(base, watermark - base); > } > +#endif /* CONFIG_KASAN_STACK */ > > void kasan_alloc_pages(struct page *page, unsigned int order) > { > -- > 2.29.0.rc1.297.gfa9743e501-goog >