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 A5026C388F9 for ; Tue, 27 Oct 2020 12:45:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0E30E20757 for ; Tue, 27 Oct 2020 12:45:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QuhHjliQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E30E20757 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 7D8416B0062; Tue, 27 Oct 2020 08:45:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 788B46B0070; Tue, 27 Oct 2020 08:45:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69FA56B0071; Tue, 27 Oct 2020 08:45:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0254.hostedemail.com [216.40.44.254]) by kanga.kvack.org (Postfix) with ESMTP id 3BADD6B0062 for ; Tue, 27 Oct 2020 08:45:42 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C7FB7181AC9CB for ; Tue, 27 Oct 2020 12:45:41 +0000 (UTC) X-FDA: 77417676882.15.linen27_460887b2727c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 00A1E1814B0C7 for ; Tue, 27 Oct 2020 12:45:39 +0000 (UTC) X-HE-Tag: linen27_460887b2727c X-Filterd-Recvd-Size: 7845 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Tue, 27 Oct 2020 12:45:38 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id m14so788846qtc.12 for ; Tue, 27 Oct 2020 05:45:38 -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=KC5kbhX2B/WcBTAKVbARUxq55uts8rGyp+acLwUDFR4=; b=QuhHjliQxgJS/kyWZwHMuClIrCrAn//vg871+u9tYKtsWpyAzlCothQa2DtWKGQyev qczxSynZ7Xvb0RO2vMOpD1JZxI5i+OOlrot85T2ys5/UbR9FtFl9bMMLBgRNFHKffIYR QT7+/CL6OcMRY7FJMoN5KXdtrl0CMEAeGpnRojS6GrQn0uHOmYR25Mb6u3RzdENf3oqA iqVtGW/Hxp9y+rGaLHyNofKw7G6zMtITwYYR7ahB28cmEUsN5qfU+DpTr5WmL+IELhjq yLNnJH2VhTjvGKcn1acniGUfXgqcbg0B/QSC4L0/jFcE1vD7BHOyJ8pzTftMeK0vo86C 0iZg== 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=KC5kbhX2B/WcBTAKVbARUxq55uts8rGyp+acLwUDFR4=; b=tkdsRc4/zXF6au3CoAOybRi8InqFxbjBjnjAtvmsSlYGR4Z1WCx5KauWFe7Yf9eucI 7JnPH9ZszRB8oJilQAt0qW8h1btM2r/H69sHLizyPR5pmsdIZn60lT9sFMzWzBndSSPB 9XaPHsohH6pKj72JOfFbQtRWx3bOHXOIbzJPZOFdSP32rAqt8zeyezCa4NzTxg+dF8nH uLnzAfOWeHPXoh5ROa2GXBCazyR58qDKz5mw4Kycvz2/uGl+7pYDUEWqJ8pnFwyIVK2+ +kZfpaay7YAOWOvMTQtrBdsmlCSYh3RhpizxgOHM2G5sJIk4BhIwG97QnYfufPIpZ4/G trcQ== X-Gm-Message-State: AOAM533Kg/0FQD8kRsUfwFgpZRk5uAA5gWqs2etYGSQUWzULo5h7fCP2 xf60KttKn5rlXnc5uEpVZrrC3lR6NcTp9FpS0Xxq0Q== X-Google-Smtp-Source: ABdhPJxG8yd6gbrzat04i4FrkjnLcubwbx/qvjTgBrR4WSSCia+T4WDx0s/wc15IBxinWHomYMAzaZRtIGRoGww2zG4= X-Received: by 2002:ac8:44b1:: with SMTP id a17mr1901995qto.43.1603802737168; Tue, 27 Oct 2020 05:45:37 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Tue, 27 Oct 2020 13:45:25 +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 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 And similarly here > > 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 and here > > /* > > * 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 > >