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.8 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 C1761C388F9 for ; Tue, 27 Oct 2020 12:47:09 +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 4AFAE20757 for ; Tue, 27 Oct 2020 12:47:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B5HdfASW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="QuhHjliQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AFAE20757 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=UWbhsaSBMBO5GoHB7nROqlWKSKbU0ukOxw+RIhCUMRk=; b=B5HdfASWMwJERQP451VCkjtGL Vdo3w5TDb48+1BZI4VvPMqy7qGSkJ7sdDmdQRzJs2QxxIb/rRZcuEO40+l8DgUexwj0pvU2OyjnUR GwV062NWek4jKGjdVO01Z+gzqd+FoZcbA2/TOrqqgQsp0OKAV4NGrHLYyEaIv+5p8CZ20S48P8V32 KL/a71yR4L0NE/CTJxRYsmz+gRTYb5cJZ9Z/iWPqYaTV56FkBTkZGdMkQSdqrTwPSgOyZv4D/PCYO 0Oc11SvVxKD/l7UHNgMObZf+w1IufyxNZ+ywjPXj7uHPEZJpMSAsySgfXL9zUvk9lQlUKta01sdIq Abkt8pJhA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXOMA-0006zM-Ea; Tue, 27 Oct 2020 12:45:42 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXOM7-0006xs-47 for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 12:45:40 +0000 Received: by mail-qt1-x842.google.com with SMTP id p45so649827qtb.5 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=UOzHWLCwIf3QFvFljKUo7gwsIyMSCxnBcjdiw6NpPMGwWvdwjDDVjcwbKpMsPyk0AQ YaIqQb8yAAN+ytALMixJH2nXl6SFGN+4QEWGS3k6lxBd0rB0+Mzobk9DfRYh6RdMfYZ1 0Xa5pUjYVJK7RHfqp1wRefkC3zvHq4ELMinBjGuZtBETC6LygNDcuvFwIAEDoHiWXEHW 1t3c3Z9ToBprIVEp/dTDlMWePnEhAptfg0VAB1SH3N+HvzoY3JuNvZZI8cGEEX1xQpT7 TFtlZEo87RHFGcD1PRDUDqiI+xcn2S5BjeivtoOsb+TMwVtpPSA2yfhb9cXPkQ8q5XY6 G+jQ== X-Gm-Message-State: AOAM530E2nyQUyxALT35vP/n/w3KvKfKkYhP3qG5fT5x9UaymIODKPxF rS1Cuw1/UsErq42R41DOVPbwHt+LMszWGMTUKO4a7g== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_084539_213861_411F1992 X-CRM114-Status: GOOD ( 27.23 ) 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 , Elena Petrova , Linux-MM , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , 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 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 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel