From patchwork Thu Sep 24 22:50:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11798389 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 84490112E for ; Thu, 24 Sep 2020 22:53:39 +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 422F22344C for ; Thu, 24 Sep 2020 22:53:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LC6yHpuJ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="kXKqNW8E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 422F22344C 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=dAYzWQM0Z29vfqj815Dv0E7C5BWUay80ddfEdVuRY24=; b=LC6yHpuJTivpAfifNgXLvwiB9 ralyOAX987retix+/bEC/x719SShQ8r6H1wtRF+26DP4SE3lX2hAWjQ2e1mjzLiwYktobCHsN7S8c 9fgv+nT2CRLebQIp4y4jP5z2G0oDdX5waZG/zLB54RvgCMOMJjTsHs3mfWFvYMOfGJB+2siZS8sLQ y3vihs6ybO20eldqaOigez8Cm6h24KygOsjFw6GxlPw1uKMDW9AdERO0bG1nuiY3XDFyJ1NCHaewP Xrs0ymofAbQdJJldyOdTou+52oVQJLGZniPpCJG9qwBY60I0lq2KPAuZrRHFyEER45QvHorZMR0os 80v7FVBMg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa5T-0002J5-0f; Thu, 24 Sep 2020 22:51:39 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa4t-00025D-VU for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:51:06 +0000 Received: by mail-wr1-x449.google.com with SMTP id j7so284053wro.14 for ; Thu, 24 Sep 2020 15:51:02 -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=o+5muahIyzBsCSQYTa2yEzLZS8Az5j3CfnIGZXwP7nI=; b=kXKqNW8E1mov7NpuLnK47U4pBbnLrdaxpw+5SAN0ltF5XUY0lFHMBL3W7EChB4zCQL QQFIk/6iv+ghmYhrNImHBqmmnRih4Zok72+1NsHqbj9q2ALs9hwUX9mNLJyEHpToqgWh tFUAqd3A0JxQ6N/uzYcU5IxlzfLN/5V0hsgFxp7EYzA5mKyOPdjJfvxvnJaZaQSGKY8g UXfXKhmVviLGaHWh6ftOKsSfXgT9bxcf2XOtxMWstc6u6xRosbEwHezA7MI2fW0rO4TM r8sFxm2VdRxzYH3O+EUoYDnRiL8nn/Xh9J54aDEAtcMuhzclKGM2hRemfaCT9XoaX2Q5 CDuw== 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=o+5muahIyzBsCSQYTa2yEzLZS8Az5j3CfnIGZXwP7nI=; b=La53m/rCFNYNk0OqWte3MlsYZlsZDUdw41UNrD/EOqxANu4ghi8icTtySX36edP//s uW4DdlVY1/ZEg/bX95N8+66s9h7RovtA0SewNZDpU11rLjBQvr5g2kfyJHKMEO7LgVzu z9Q2y4+RBqmHEYCMhogb144g74WESsMw7om66suEs+kezF/X+QApOSlVdyGwBqHi9d4r Qtl1cDColJ57hm3cRpWUOtBxt9J4sS0HH11woxv7pJJKAS2jeIr/gwD8H//p/mAVjkOo sdvciBzL2xOK/kHu14wNKSfCw6G4snqLsX7J1yfinGasgBrzTNMUx/jWDLs+O4VM+MH0 Nlkw== X-Gm-Message-State: AOAM530IWmsGdx6THDSkQf5Y+aTsTmsnqe+cuNhC9GWY4jWGtBK4DlNA n7meLQRp55FyU3RHQkQjb2x0Yo8UL0KuYP1d X-Google-Smtp-Source: ABdhPJyehUeiSJg+kXRxdeDQ0lGhmutHtVinnAroN/FF5UMTOjOh25DNFbXLwa+fkNeTRy0ybwFRHtyLRI1oOeSB X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:750d:: with SMTP id o13mr918934wmc.54.1600987861205; Thu, 24 Sep 2020 15:51:01 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:11 +0200 In-Reply-To: Message-Id: <9de4c3b360444c66fcf454e0880fc655c5d80395.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 04/39] kasan: shadow declarations only 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_185104_093663_8F421159 X-CRM114-Status: GOOD ( 15.68 ) 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 [2a00:1450:4864:20:0:0:0:449 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. Group shadow-related KASAN function declarations and only define them for the two existing software modes. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I864be75a88b91b443c55e9c2042865e15703e164 --- include/linux/kasan.h | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index bd5b4965a269..44a9aae44138 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -3,16 +3,24 @@ #define _LINUX_KASAN_H #include +#include struct kmem_cache; struct page; struct vm_struct; struct task_struct; -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #include -#include + +/* Software KASAN implementations use shadow memory. */ + +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_SHADOW_INIT 0xFF +#else +#define KASAN_SHADOW_INIT 0 +#endif extern unsigned char kasan_early_shadow_page[PAGE_SIZE]; extern pte_t kasan_early_shadow_pte[PTRS_PER_PTE]; @@ -29,6 +37,23 @@ static inline void *kasan_mem_to_shadow(const void *addr) + KASAN_SHADOW_OFFSET; } +int kasan_add_zero_shadow(void *start, unsigned long size); +void kasan_remove_zero_shadow(void *start, unsigned long size); + +#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ + +static inline int kasan_add_zero_shadow(void *start, unsigned long size) +{ + return 0; +} +static inline void kasan_remove_zero_shadow(void *start, + unsigned long size) +{} + +#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ + +#ifdef CONFIG_KASAN + /* Enable reporting bugs after kasan_disable_current() */ extern void kasan_enable_current(void); @@ -69,9 +94,6 @@ struct kasan_cache { int free_meta_offset; }; -int kasan_add_zero_shadow(void *start, unsigned long size); -void kasan_remove_zero_shadow(void *start, unsigned long size); - size_t __ksize(const void *); static inline void kasan_unpoison_slab(const void *ptr) { @@ -137,14 +159,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, return false; } -static inline int kasan_add_zero_shadow(void *start, unsigned long size) -{ - return 0; -} -static inline void kasan_remove_zero_shadow(void *start, - unsigned long size) -{} - static inline void kasan_unpoison_slab(const void *ptr) { } static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } @@ -152,8 +166,6 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #ifdef CONFIG_KASAN_GENERIC -#define KASAN_SHADOW_INIT 0 - void kasan_cache_shrink(struct kmem_cache *cache); void kasan_cache_shutdown(struct kmem_cache *cache); void kasan_record_aux_stack(void *ptr); @@ -168,8 +180,6 @@ static inline void kasan_record_aux_stack(void *ptr) {} #ifdef CONFIG_KASAN_SW_TAGS -#define KASAN_SHADOW_INIT 0xFF - void kasan_init_tags(void); void *kasan_reset_tag(const void *addr);