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 0E946C4742C for ; Mon, 16 Nov 2020 11:00:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 73D3A20A8B for ; Mon, 16 Nov 2020 11:00:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ojt003Ul" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73D3A20A8B 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 E28B46B006C; Mon, 16 Nov 2020 06:00:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB26F6B006E; Mon, 16 Nov 2020 06:00:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2D2F6B0070; Mon, 16 Nov 2020 06:00:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id 8D4F46B006C for ; Mon, 16 Nov 2020 06:00:43 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 295A7181AEF1D for ; Mon, 16 Nov 2020 11:00:43 +0000 (UTC) X-FDA: 77489988366.02.sea17_5707ad227328 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id F008310097AA0 for ; Mon, 16 Nov 2020 11:00:42 +0000 (UTC) X-HE-Tag: sea17_5707ad227328 X-Filterd-Recvd-Size: 7517 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Nov 2020 11:00:42 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id i12so12531457qtj.0 for ; Mon, 16 Nov 2020 03:00:42 -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=FX8GD+b8oMZGG7RMfkMYcB2Sb5EDK5FE7PKEweB+0bg=; b=Ojt003UlpmkrS+sQ1TQUN2zeBxWoQgiHTyQyOraAFHTpOpuEz7EnHTOYMGbWE0fs0B EF5O7dcxHUGo2tlteywoPZTgAuyQztFbOPomED6EGVvuLowGkFCbPXHs1Ol/fyjQjsc1 pn5cgVfOrt0iblSESh5xPqcL/mU+ZJGrHPnCpJ1Z7Niof6IVup10P22Vvq/VTHS4+hzJ gZFYUvHtfjzo7Y5R2twqZFQpH2tDdd6CzWtxSiW8TOmesIyG02+2lpspMTvhNDl7Sb8J 71eG1H27trjJb4xeC8LjH8QhWd7TEQ6pQmRQrvmQs26Q3mfUqqhqkqFkwcJUHOA11Fsm IsWA== 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=FX8GD+b8oMZGG7RMfkMYcB2Sb5EDK5FE7PKEweB+0bg=; b=c5aiSCL68CM1gb6gOyNsjLXdlYotCIaOYwNNaSLG9vGdzg5hxsjzWfsQlj1b7SUMt1 yYH9tuS8n9aKjcjvW3/U8G08ZV432jmWTWhHhuwiVtmVgyBARd4IB2vygfalmmYBbCO+ c2eLuceGP//Y2gArW5oxita1JBmgalix4p2+mfv9eA+hWr8wvM0G/TcGazUAiJVaXloS PFWEcjyLg/vT3k00Zirld3RcZuOp1ZiofM0xJScP4uMKBXelteLuCht9gh9rod+sCAK3 FEaczq+xFlU2DdYugzhVS7j468xK0wM6cbE0Qr5D3lFyL4b/WZ/nf2GnSMW2IVSSQPR2 6BvQ== X-Gm-Message-State: AOAM533imuiYSFDgpQEauEjfmhKd+rBrhN9J79K/8xBBNg3Ldk4NFIzb Pc21RGZM06NBca+f9VxZeDjU954emeBjNauqvS/MYw== X-Google-Smtp-Source: ABdhPJxCni13N4vuA3KlP+ykcZHvRiV94mZVfVD08+wGb2YPqeZdS5VQhMa8uyPTHN5SQXcnL/RPYTFZBQGAWOWAWwM= X-Received: by 2002:aed:2b47:: with SMTP id p65mr13025705qtd.337.1605524441642; Mon, 16 Nov 2020 03:00:41 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Mon, 16 Nov 2020 12:00:30 +0100 Message-ID: Subject: Re: [PATCH mm v3 04/19] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Will Deacon , Vincenzo Frascino , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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 Fri, Nov 13, 2020 at 11:20 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. > > Note, that CONFIG_KASAN_STACK is an option that is currently always > defined when CONFIG_KASAN is enabled, and therefore has to be tested > with #if instead of #ifdef. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Marco Elver Reviewed-by: Dmitry Vyukov > Acked-by: Catalin Marinas > 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 0c89e6fdd29e..f2109bf0c5f9 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -76,8 +76,6 @@ static inline void kasan_disable_current(void) {} > > void kasan_unpoison_range(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); > > @@ -122,8 +120,6 @@ void kasan_restore_multi_shot(bool enabled); > > static inline void kasan_unpoison_range(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) {} > > @@ -175,6 +171,12 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > > #endif /* CONFIG_KASAN */ > > +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +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 0a420f1dbc54..7648a2452a01 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -64,6 +64,7 @@ void kasan_unpoison_range(const void *address, size_t size) > unpoison_range(address, size); > } > > +#if CONFIG_KASAN_STACK > static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) > { > void *base = task_stack_page(task); > @@ -90,6 +91,7 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) > > unpoison_range(base, watermark - base); > } > +#endif /* CONFIG_KASAN_STACK */ > > void kasan_alloc_pages(struct page *page, unsigned int order) > { > -- > 2.29.2.299.gdc1121823c-goog >