From patchwork Thu Sep 24 22:50:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11798407 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62783139A for ; Thu, 24 Sep 2020 22:58:25 +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 2717C2344C for ; Thu, 24 Sep 2020 22:58:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LkHQBSMd"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="qMHMZkbS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2717C2344C 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+patchwork-linux-arm=patchwork.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:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qUrLEVUdWKvcqdnRRO1nt91ep/PVe82CqLatj34S1wY=; b=LkHQBSMdI5hGFx+1rj15y/C39 SKPBE501bLpSBayNnBFcTtaO24oZ7LWLg16ZMLc8za8Q8Jf1+rfAeXi5E8tMHufnzB9lrm+ltaGNd 8WL3VziwouhpScXhH4CrtqhAlW1NH3X8QIS6zR8WPNR0MH2JYDNFuZZvhX9YQ2Uuo8iJRVzUj87z3 G1HGcZ1MgBNv1I0hRiZQxFrRDrBYcbiE4QyqLbVgJHmytQ5C+0G8AvgK+f0PebPq1nkAuEANyAMlx htyAokYVIpMN8L5KAHobE2uJQXjulAwJhCXUqOi3IL7Zw0RHSc1jVsrPkfQXKVX1BGpAXQmEjOSPK 2nAYdSfYw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa9m-00043w-EX; Thu, 24 Sep 2020 22:56:06 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa5K-0002F9-9w for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:51:31 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id dj20so455755qvb.23 for ; Thu, 24 Sep 2020 15:51:28 -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=ZYBZQ28rYl/uYPDoQ+ete7cs1v1ZYV++yqEN/4Z93+s=; b=qMHMZkbSw8yjjbJ6CFOvIEy9Ztx6RQWXXF3Jv2UctW4l/do3LXouDsI5I1+H1PpGr4 5D4ZpYl6mG6CbtwwPEnSQ7aRu+cQG+mt+qmYT0YqfWRm2o/2SwJZ92SO5t7/Muu8UOHQ MeFEvvunkhDLw9xEDSsYltD81ximal49RH2MfDhmocAiC5R1eVnXHd0vHbLKLHbFF0wQ BAtE7S9zCDzN00wmaVaDXfIN1DQ6xiEoTxyECKJ5sGmekeOr7IS544S/Jc3JLlT6hMDY 93H1TWd5tzRPQnjijB/ehn05CT6yNx1Yw8PyWKnw4Eg6nyu4XQcankesKURglKL2JX83 GCsQ== 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=ZYBZQ28rYl/uYPDoQ+ete7cs1v1ZYV++yqEN/4Z93+s=; b=DC8LOQROImYO++HngcZ1gbOArUwQRcyc9UwPQc8GRow3AM7eDhNSJNRf8YIchQEFF9 ULnTVUSUaDtUSHK/XTHU5lLknqdz01PdG0MI6PrJ9lwKttklnYgD53mS1hKzy5SMeCiF NfQuZ1vf1isAfhJPfpB6grR2LpHEzRtJL0p9apsb8aTB8FNONKG9OOo4ggku/MkzyRB4 UawMiW0oRISRF0dBALa/CvnGCTJkEasEofpvqxDqDTEc+jFmSwo3mKPqs7Jnj+wgZlCd hynomq4dccbruztUeoX5XeXKOiDjWy9oDbjXIEWHnZ3+QEojt7/YtJdItCTfPxUlSSAb 4DJw== X-Gm-Message-State: AOAM531QAU4gUMup2KPhqRd1yZsRmhm2ZbHGq7SscVDu8zKGpbCqjTZo 3irIfRJshWdGtW/lSRTa4PzbkwwV9KaALO5N X-Google-Smtp-Source: ABdhPJz3OVklOxPviABzXQPnp8UiFL2b+Q4A3n2bquCvO0QTAIxakjMduFPhbd2rV7v7Tcuro+7Wa664QKZ/qGwR X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:cb11:: with SMTP id o17mr1470066qvk.44.1600987887139; Thu, 24 Sep 2020 15:51:27 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:22 +0200 In-Reply-To: Message-Id: <3f395efd4f415a41ea72f18e181c0bf551a21094.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 15/39] kasan, arm64: only use kasan_depth for software modes From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200924_185130_402639_99163E73 X-CRM114-Status: GOOD ( 18.56 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f4a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender 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 , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. Hardware tag-based KASAN won't use kasan_depth. Only define and use it when one of the software KASAN modes are enabled. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Catalin Marinas --- Change-Id: I6109ea96c8df41ef6d75ad71bf22c1c8fa234a9a --- arch/arm64/mm/kasan_init.c | 11 ++++++++--- include/linux/kasan.h | 18 +++++++++--------- include/linux/sched.h | 2 +- init/init_task.c | 2 +- mm/kasan/common.c | 2 ++ mm/kasan/report.c | 2 ++ 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 4d35eaf3ec97..b6b9d55bb72e 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -273,17 +273,22 @@ static void __init kasan_init_shadow(void) cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); } +void __init kasan_init_depth(void) +{ + init_task.kasan_depth = 0; +} + #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) */ static inline void __init kasan_init_shadow(void) { } +static inline void __init kasan_init_depth(void) { } + #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ void __init kasan_init(void) { kasan_init_shadow(); - - /* At this point kasan is fully initialized. Enable error messages */ - init_task.kasan_depth = 0; + kasan_init_depth(); pr_info("KernelAddressSanitizer initialized\n"); } diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 18617d5c4cd7..4ca1b9970201 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -40,6 +40,12 @@ static inline void *kasan_mem_to_shadow(const void *addr) int kasan_add_zero_shadow(void *start, unsigned long size); void kasan_remove_zero_shadow(void *start, unsigned long size); +/* Enable reporting bugs after kasan_disable_current() */ +extern void kasan_enable_current(void); + +/* Disable reporting bugs for current task */ +extern void kasan_disable_current(void); + #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ static inline int kasan_add_zero_shadow(void *start, unsigned long size) @@ -50,16 +56,13 @@ static inline void kasan_remove_zero_shadow(void *start, unsigned long size) {} +static inline void kasan_enable_current(void) {} +static inline void kasan_disable_current(void) {} + #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ #ifdef CONFIG_KASAN -/* Enable reporting bugs after kasan_disable_current() */ -extern void kasan_enable_current(void); - -/* Disable reporting bugs for current task */ -extern void kasan_disable_current(void); - void kasan_unpoison_memory(const void *address, size_t size); void kasan_unpoison_task_stack(struct task_struct *task); @@ -110,9 +113,6 @@ 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_enable_current(void) {} -static inline void kasan_disable_current(void) {} - static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} static inline void kasan_free_pages(struct page *page, unsigned int order) {} diff --git a/include/linux/sched.h b/include/linux/sched.h index afe01e232935..db38b7ecf46d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1192,7 +1192,7 @@ struct task_struct { u64 timer_slack_ns; u64 default_timer_slack_ns; -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) unsigned int kasan_depth; #endif diff --git a/init/init_task.c b/init/init_task.c index f6889fce64af..b93078f1708b 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -173,7 +173,7 @@ struct task_struct init_task .numa_group = NULL, .numa_faults = NULL, #endif -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) .kasan_depth = 1, #endif #ifdef CONFIG_KCSAN diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 543e6bf2168f..d0b3ff410b0c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -46,6 +46,7 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags) track->stack = kasan_save_stack(flags); } +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) void kasan_enable_current(void) { current->kasan_depth++; @@ -55,6 +56,7 @@ void kasan_disable_current(void) { current->kasan_depth--; } +#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) { diff --git a/mm/kasan/report.c b/mm/kasan/report.c index f28eec5acdf6..91b869673148 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -290,8 +290,10 @@ static void print_shadow_for_address(const void *addr) static bool report_enabled(void) { +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) if (current->kasan_depth) return false; +#endif if (test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) return true; return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags);