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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 4DA59C433E7 for ; Wed, 14 Oct 2020 20:44:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E27B22224D for ; Wed, 14 Oct 2020 20:44:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="uaQGYSwB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E27B22224D 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 7AFE294000A; Wed, 14 Oct 2020 16:44:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 786286B0071; Wed, 14 Oct 2020 16:44:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69C0794000A; Wed, 14 Oct 2020 16:44:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 356EE6B0070 for ; Wed, 14 Oct 2020 16:44:56 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C5E68181AC9CB for ; Wed, 14 Oct 2020 20:44:55 +0000 (UTC) X-FDA: 77371710150.23.jam62_19071402720e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id A20B937606 for ; Wed, 14 Oct 2020 20:44:55 +0000 (UTC) X-HE-Tag: jam62_19071402720e X-Filterd-Recvd-Size: 7003 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Oct 2020 20:44:55 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id w23so408188wmi.1 for ; Wed, 14 Oct 2020 13:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=Jb27DzgR4IKP5v5pwQruBqbER0RzES4crWan7oQ9jac=; b=uaQGYSwBpt8wEWnHpqu5ORNnmQNuhf0vqH2nDCmWhL7Hb/BuP7SQtbew7r53LyxTAn 8Ys9HwjQxkJ38OfUhNru9hNfpD/qZpUqtozrR56elJD9Wd7NnDiCoQL9CVUxSudE3Y0y c7GGmYxMv5DmneuyUGjw4dQ9S9HliHUjI6V14BomxK3C6evHnAjZnHzepI7UoAqxXS6y cTYp2zxCyv+DtJZlY2VnT5iaHQO8kq+4EcDNsYk4T32OFhw4FdrpRuMUI+lnG0cyoOJY DmTfQI8qmiKn5UrvM4XzzBrbbNYa0tBLEekehS0HJArCVgVamwk619jUsJZwsHK4Ce04 6n6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Jb27DzgR4IKP5v5pwQruBqbER0RzES4crWan7oQ9jac=; b=RTGF8NuiLXgN4mM4qSXdjBNIwb71a3T0PeLWyzXY9+wRjUe9OGw+BSUoSRxyBfnMn6 2VHpzRdyLBJJMOnU01XKnayHe1JdPEV99zr2fWozpqujofp/U7614puNz+ieISvn0NjF AHH1eUlvKLG99c1Dw9uZiO+hvIBYpuLUjVlM8ww4Y8N2LujKuPXnLYjK3/5hnNrgN6sU Nc8YTACpZOnuhmRGx+NGratti7s8ve63bkcmpvOKbQrofn0oMkcvfOqnf8CtirX/5kes n8rNPOGp08DSSiXHwcqE2vW4XU9P9zK1x8JJeUdw/FyZdycJnW6L+c25jbHkFnOt2OST URow== X-Gm-Message-State: AOAM530kgt0uCkONNfi32U/bJ0YO8d5fB1Kbx4npuSXbn7WcLXskr6lb GaTvY9oHlNtSTWs5cw8Y1JsDi8OtSE9IBJTB X-Google-Smtp-Source: ABdhPJzjCdz9j8/QTVwhuC5jK0ycsFa4Tde9e+psT+rJIXrn5DYLcJG2qqqtoaTvFbIZ8bfCtmYJAtJr9LorUzK6 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:3b8a:: with SMTP id i132mr609269wma.178.1602708294026; Wed, 14 Oct 2020 13:44:54 -0700 (PDT) Date: Wed, 14 Oct 2020 22:44:32 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH RFC 4/8] kasan: unpoison stack only with CONFIG_KASAN_STACK From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver , Evgenii Stepanov Cc: Andrey Ryabinin , Elena Petrova , 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, Andrey Konovalov 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: 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 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 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 +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.28.0.1011.ga647a8990f-goog