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=-18.9 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_AGENT_SANE_1,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 D91E6C5517A for ; Wed, 11 Nov 2020 16:13:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67ACB20659 for ; Wed, 11 Nov 2020 16:13:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="djjmtjGB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67ACB20659 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 E3FA36B0071; Wed, 11 Nov 2020 11:13:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF0386B0073; Wed, 11 Nov 2020 11:13:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB9036B007D; Wed, 11 Nov 2020 11:13:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id 9DF996B0071 for ; Wed, 11 Nov 2020 11:13:43 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 47A071EE6 for ; Wed, 11 Nov 2020 16:13:43 +0000 (UTC) X-FDA: 77472633126.29.care74_4211544272ff Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 90A90180868EE for ; Wed, 11 Nov 2020 16:13:41 +0000 (UTC) X-HE-Tag: care74_4211544272ff X-Filterd-Recvd-Size: 7678 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 16:13:21 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id r17so3090392wrw.1 for ; Wed, 11 Nov 2020 08:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=WwThXO74wAdZUw9ureBsdbo33+GC/qabfRYu0sfQ7ak=; b=djjmtjGBk5gDB/hROrxHCiGtDZAZL60t9zoHD5GsK82Aub2f4s3e8/Ulq9ERjEh1DE Y0A8wuBQ9h8pOE4rXfZfG5+Ri54eyY589jflGgoW13qec35X4CLZ7I3ayHSwnNnjeiL0 toGTyCTU2btoMKHwuaQjzCr29rp5NjQt1GrXCVoISrwi6QRDcH607nUvhS7KMpzvwAOm CbF/sRGoh/S13tZhrlJGfujKQPRdbFqxXf1/veX2gczEykzMa59BzQGn+/pVLgAscfFB zQNM5rucsQ1b4IQyoih7TMyt5RtQb+BGXTz+owYovqbYLvQ/iw90aEMnV1qO4fyNA/r3 pzAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=WwThXO74wAdZUw9ureBsdbo33+GC/qabfRYu0sfQ7ak=; b=tOjfSpFRUlriB0Ot5Q+rfRiCYhnTwfsHHs3j5Mb7T00ZjqgJWYchTo06pwlaUJvMIQ IlBDKrm7AXW9JEilqNxXsGLtNpdqcfeUp9SJKXwjKFOsqnBjOw84hHjsml5V9ffUsKQv 2P1e08Y0Nd8FnZD9+4ciDENxlfeDqn5TxXgVLmaYvO1kmlBMXX2nqfd9q7VcYFgEndjx ZYDrav0NCsmukzAhK9l6FXd+md+yc86iEBfbTzlSh+nPwohqX6oJ+HeqK9zSiQrW1Pmj Y7weC8QE3i6qB9gqyTUgtNYk0xJYfsqINai0bPMbGKnEzhkxE6GTwP7RLOg4Cdfhk5Xg IZLA== X-Gm-Message-State: AOAM5319CDfU/jGDVhiWyr4BXsRn/5j2VO8QJk89NTOqbrQ+viOg/R/y +NSTw8dFcf4Mt8xItVqJMoSevg== X-Google-Smtp-Source: ABdhPJz+5eUmuNniwu1ZE84a9/FZtwS0urxMa0j8Iv8QOyZNsXFL+gglblNtmVZdlqC8lQNRXFmd7g== X-Received: by 2002:a5d:5446:: with SMTP id w6mr21313985wrv.122.1605111200317; Wed, 11 Nov 2020 08:13:20 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id b8sm3334226wrv.57.2020.11.11.08.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 08:13:19 -0800 (PST) Date: Wed, 11 Nov 2020 17:13:13 +0100 From: Marco Elver To: Andrey Konovalov Cc: Dmitry Vyukov , Alexander Potapenko , Catalin Marinas , Will Deacon , Vincenzo Frascino , Evgenii Stepanov , Andrey Ryabinin , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 04/20] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Message-ID: <20201111161313.GF517454@elver.google.com> References: <7e95d4739f5617b2c1acf52f37e01f1ca83750b5.1605046662.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7e95d4739f5617b2c1acf52f37e01f1ca83750b5.1605046662.git.andreyknvl@google.com> User-Agent: Mutt/1.14.6 (2020-07-11) 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, Nov 10, 2020 at 11:20PM +0100, 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 > 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(-) Reviewed-by: Marco Elver > 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 f22bdef82111..b9b9db335d87 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_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); > > @@ -122,8 +120,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) {} > > @@ -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 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 > 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.2.222.g5d2a92d10f8-goog >