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 4DF81C4741F for ; Thu, 1 Oct 2020 23:11:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E218F206C1 for ; Thu, 1 Oct 2020 23:11:26 +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="I2c3loWO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E218F206C1 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 803726B009B; Thu, 1 Oct 2020 19:11:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 794A66B009C; Thu, 1 Oct 2020 19:11:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67C1D6B009D; Thu, 1 Oct 2020 19:11:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0164.hostedemail.com [216.40.44.164]) by kanga.kvack.org (Postfix) with ESMTP id 383A36B009B for ; Thu, 1 Oct 2020 19:11:25 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D41DF1EFD for ; Thu, 1 Oct 2020 23:11:24 +0000 (UTC) X-FDA: 77324904888.12.card92_46011ee2719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 9F75618013807 for ; Thu, 1 Oct 2020 23:11:24 +0000 (UTC) X-HE-Tag: card92_46011ee2719f X-Filterd-Recvd-Size: 6118 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:11:24 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id a10so111412wrw.22 for ; Thu, 01 Oct 2020 16:11:24 -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=RtCJwMgIYvelzx6W+VqX6CCQBYnpjAVMkxalLwUkkpk=; b=I2c3loWOHM7SCVXcrY7+bGT77nii/87DX8jc1/GMxpKG7sNQrXxoxNxZnKSFeiEdtV ehsiMifoImgUAmhIjINxdqV3n1eNoaETV682/tjXrnaehPH1MzP0MUZ7NaMkMjEpGR9b ejVUbZQXU/9xJd2mdB/KY1vsi5qfcwIBIfv07/g0rFNXBycH2w8dSEEpVxthy+iRrywd 2Aq+Rk4eTYog2daU0ip0eDIh5GqXxhTXJ3X+/vdeg27gFSpxtnf31QGt85k2BZGod4kT wQ77Cjb7KHtejYudt6uEOpEwCia2se1D1EEoK2/9EyPQcYYeMQ60KuDEWASVcvxawmMV jdhw== 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=RtCJwMgIYvelzx6W+VqX6CCQBYnpjAVMkxalLwUkkpk=; b=luQ8Q1/IRMhJDsf8LI0X1F/6BbHUV4WdKPeLd3qXSwV/giaHfCgZJFF32AJa6vcuh8 xT/gNGDwJL09jv0a33l2pNg7wk8rKD9iD1djNIZU8SX5BuJcFRq/DxAmquPTjhPBvDFi zOKF0Cj9bJzRc4NaM2MllGdanM2VDsD6ATJ7Dq2EeB1D6Hln2ILyPOAb8GZplJRLEMPo fOvYgN73+x9prLulSCtlTY2PY/XhGUHIGoUDWG1J6KvZzCkrb+PopjlBiePiLTHZTRTT AH61czW6CgiSI3QKOGKqZ2Qjb+oukNQ6V01AeU1+V2ayV6xqiH+3Nb68n4rYbEuIXkHC Pq3Q== X-Gm-Message-State: AOAM532wZD+G2FmF9DdVIlwdKS0v6W43Nta+8DfuyMxxglv0bF/sY+bn pUQaHUo1z2aNIHVpQdUE8UGHvHV4+2U4aqeV X-Google-Smtp-Source: ABdhPJzi73jCUfp6OLDpNOLLkF/C9fX4ruuBC+EQr1mjbwdiCBE+pTPfBCbXwWRaFmOgLV4vAkoudzQEnl6eInTn X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:9d82:: with SMTP id g124mr2345719wme.4.1601593883158; Thu, 01 Oct 2020 16:11:23 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:17 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 16/39] kasan: rename addr_has_shadow to addr_has_metadata From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , 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: 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 be using shadow memory, but will reuse this function. Rename "shadow" to implementation-neutral "metadata". No functional changes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I03706fe34b38da7860c39aa0968e00001a7d1873 --- mm/kasan/kasan.h | 2 +- mm/kasan/report.c | 6 +++--- mm/kasan/report_generic.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 8dfacc0f73ea..0bf669fad345 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -146,7 +146,7 @@ static inline const void *kasan_shadow_to_mem(const void *shadow_addr) << KASAN_SHADOW_SCALE_SHIFT); } -static inline bool addr_has_shadow(const void *addr) +static inline bool addr_has_metadata(const void *addr) { return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START)); } diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 91b869673148..145b966f8f4d 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -329,7 +329,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write, untagged_addr = reset_tag(tagged_addr); info.access_addr = tagged_addr; - if (addr_has_shadow(untagged_addr)) + if (addr_has_metadata(untagged_addr)) info.first_bad_addr = find_first_bad_addr(tagged_addr, size); else info.first_bad_addr = untagged_addr; @@ -340,11 +340,11 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write, start_report(&flags); print_error_description(&info); - if (addr_has_shadow(untagged_addr)) + if (addr_has_metadata(untagged_addr)) print_tags(get_tag(tagged_addr), info.first_bad_addr); pr_err("\n"); - if (addr_has_shadow(untagged_addr)) { + if (addr_has_metadata(untagged_addr)) { print_address_description(untagged_addr, get_tag(tagged_addr)); pr_err("\n"); print_shadow_for_address(info.first_bad_addr); diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c index 42b2b5791733..ff067071cd28 100644 --- a/mm/kasan/report_generic.c +++ b/mm/kasan/report_generic.c @@ -117,7 +117,7 @@ const char *get_bug_type(struct kasan_access_info *info) if (info->access_addr + info->access_size < info->access_addr) return "out-of-bounds"; - if (addr_has_shadow(info->access_addr)) + if (addr_has_metadata(info->access_addr)) return get_shadow_bug_type(info); return get_wild_bug_type(info); } -- 2.28.0.709.gb0816b6eb0-goog