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=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 9CEC9C4742C for ; Mon, 16 Nov 2020 11:01:57 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B29120657 for ; Mon, 16 Nov 2020 11:01:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tYBGAn9O"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Ojt003Ul" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B29120657 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Y/Tq572LY4Y0rOlRzp8sml6KVsdWDoWsuXeRnqhwAzw=; b=tYBGAn9OE0L/0XV1o6pPa0/Vp G6okmZoj+yG66CbgnR3EfVWcJzhHk5CQizPejFBUNH3Cl0uMj7f4rgntd6L4zVtT1a9EmeTOkK5p4 mFiWFatBsejCgth5BcioUpICirZuWwLJ5sHGBw9eLoF7bv1nNakSlUrUEhfOvhu/eL9pHGJAvwhvb l6aom7Rv768gvLigqWXTLd7BVdHCcECgPf+sXRIP5PntiCYPCYvH7p6PnIB3ZyTIZvaAlcadCRS26 2MplOPBeNCcxOkBNEuchCBkkYBZxpWjN5v6DA4/fDA2Y90M15wSHvSVYeMxjnbT6J4toDIkn+efRx rRoMpYJTw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kecFa-0006g1-EI; Mon, 16 Nov 2020 11:00:46 +0000 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kecFX-0006ex-Gw for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 11:00:44 +0000 Received: by mail-qt1-x843.google.com with SMTP id j31so12495018qtb.8 for ; Mon, 16 Nov 2020 03:00:43 -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=IgxcUvcqgYypVbB0woA9yOu+VrCKESdsGkggEDCQ+cAOVcyLsClN0BYTtDSWD8+sNJ 6gyXdATyxB2/PyOQEfKZCxzYc0TmjkS+CW430gQL3FHtho4T+qiN9GkipBKOvUIHwjv9 HneUiwrridumBIfRI96aKNrswUUKS8hmZ+NpchyvPgu4PgknhDUPDggMqHeHIvwFsbj0 VKHQZ3YyYhjG0v8VXzurbL3oOGXigzGvGsiFxFfbazESExYkY53fP8rum+HoaQwMt2TO kSLaB35Llg4KtYFX23I3jGIICEmc2muMWhlDC4bVw2+Ah1Eu/rFnPaAN2cKy8kC3qoAs h/SA== X-Gm-Message-State: AOAM531gB+t/OTDsr8qSG2cXOHx/YocFSG/XTFGrFCHp+TLMtBQcJha8 A8cYsVVA4odjg5+Sx9C8h+af9iUfTt+RKn2qMcrAkQ== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_060043_619183_77E27C1F X-CRM114-Status: GOOD ( 24.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Linux-MM , Alexander Potapenko , Linux ARM , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel