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=-20.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 A3CF1C433E4 for ; Fri, 14 Aug 2020 17:28:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 672952078D for ; Fri, 14 Aug 2020 17:28:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DrFj49N6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 672952078D 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 2997C6B0027; Fri, 14 Aug 2020 13:27:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F5586B0028; Fri, 14 Aug 2020 13:27:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BB466B0029; Fri, 14 Aug 2020 13:27:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0077.hostedemail.com [216.40.44.77]) by kanga.kvack.org (Postfix) with ESMTP id EA13E6B0027 for ; Fri, 14 Aug 2020 13:27:58 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B2139181AEF23 for ; Fri, 14 Aug 2020 17:27:58 +0000 (UTC) X-FDA: 77149857036.11.stone18_2510f8826ffe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 8A2B4180F8B80 for ; Fri, 14 Aug 2020 17:27:58 +0000 (UTC) X-HE-Tag: stone18_2510f8826ffe X-Filterd-Recvd-Size: 5755 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 14 Aug 2020 17:27:57 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id b18so7437559qte.18 for ; Fri, 14 Aug 2020 10:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=uzelTOrZuAbTWnllhx2uagoa2R4S00LwGFOB2texzaA=; b=DrFj49N6R4eCrQJphz6+ETLQSN0RvuR+8g3jRWO5Kv9Cu3h0thzUUGYLi70G7SUsL+ kk40BvPcKjV4y5B+tEwCs0wOVQz3Qo6Srdv07PKEjyECoSiZoRIroE761xkoNWipUcMN roNpIlNYf89LDQz/ZqjUGEJZHvbnTtlRJ0+MUIuDazMnwFSw53XRUzj07eRKXWAfZijn dzNZO8q+k/fcomM5fZfG+FEMWYRiHVBFBoFFEBTlaayDyg+1daA7M4MSqNiq+43cjUm2 g1oHg4iWrX+S5n5/Ax9bx6fOL4mospA1TbRF8FPjvTbwcC/rp93zDPO8bpBJknFheRvr RkUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=uzelTOrZuAbTWnllhx2uagoa2R4S00LwGFOB2texzaA=; b=SwMKZiW0S6wkn3pUDXw+XAk96huqyJgjAuiq4fxxXk2wGTJMjzmARhAY++KK4jGFE4 Njp04eXwUUsOzlE+oMqIJKPzj1u5t8U82iZLbKbTtB5z91+jAz2JIkQ9tpe5nSodSo17 Ld+b6CxbvWeYF0SrqK/IeOgYEJIjOXolRx912GS8NC89aSZLh+dB64g+YI6xAp9d+TKw 18+3V4SdEkxqkUw1Xg6ru1TlfiKM45FQUyoGakrbIojl5q6JwRVMBgmFzWxAoa/HfwrA KgWRMunE3eA7WqGJVbazVCxRVj4N2CKCwpdBsSaUMskZUz5lYhYg4jzYIyNlvAMSDQPI v1RA== X-Gm-Message-State: AOAM531IL22Z0aJv0oTgmD6+QnYBsGbPuEeGrG2c5Aj1HukNDv1rTeeq /d47j/kSOKHoWXtegdqe1NpVoljoWyDDeZUk X-Google-Smtp-Source: ABdhPJx9kLUufXWadY2TxpJl/SQvQjOV7v/3wKY2MxvbtkT8yluKpe6HFl7wJbjM0gRLHD3MjV79RqnFtPzqoG66 X-Received: by 2002:a05:6214:8a:: with SMTP id n10mr3654847qvr.13.1597426077265; Fri, 14 Aug 2020 10:27:57 -0700 (PDT) Date: Fri, 14 Aug 2020 19:26:56 +0200 In-Reply-To: Message-Id: <82cf4f8007645f8c45e6e4847a28a743dfb9cbda.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 14/35] 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-Rspamd-Queue-Id: 8A2B4180F8B80 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 --- 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 15cf3e0018ae..38fa4c202e9a 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -145,7 +145,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 8463e35b489f..ada3cfb43764 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -334,7 +334,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; @@ -345,11 +345,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 427f4ac80cca..29d30fae9421 100644 --- a/mm/kasan/report_generic.c +++ b/mm/kasan/report_generic.c @@ -122,7 +122,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.220.ged08abb693-goog