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=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 590C8C43461 for ; Tue, 15 Sep 2020 21:22:52 +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 D87972078E for ; Tue, 15 Sep 2020 21:22:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Fkpdl/De"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="LidLdQly" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D87972078E 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+linux-arm-kernel=archiver.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=pKt95MFVyKGgUZlL+GMHg53Xyp3vY7NpJhBcFAX4Ta4=; b=Fkpdl/DegPJi0UcBfPD8GBHbb FYOAHbjW5OJx+a8f/KAoWANKpDUsG9x7paQTNrrJ1TOiJsoocfzr5FbYpNEB1nSugW/4L3jyb6O5Q c+1HP/DnxaCnZHezWCJba4Y15Xh60dhnK/Pgf6oEVq3WOVLIr3Qm3ScItaUnWDyi3Wh7xMGd+i+Hs IaGtHT9ryQI8/cOWKDP7VPG1eHZaahaH0BSC4mwdysQD41Epv0NwYHQXeBhZUJq/T6MQgWF9OWDXl uUBXWH+cobg8RIEtdueOeBc4f+u0NvrAtQd9shDlVBNJjICfsGCZEXTQD+JrwvWjZtMqrqZdceF7B PZb/kSeQw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIINa-00007d-Vz; Tue, 15 Sep 2020 21:20:47 +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 1kIIJv-0006z1-LI for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:17:05 +0000 Received: by mail-wr1-x449.google.com with SMTP id i10so1705978wrq.5 for ; Tue, 15 Sep 2020 14:16:57 -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=NFU27GtWbL95WCt8F/LRedzvWo/LtApbnjc66sNmtks=; b=LidLdQlyti52eZWrhFHwUDuJizCaKRW6hyaJQDPEh27JNL1d+0SqlmcdF2NYGQzQTj 8OmpJEhJfeBEK+B+bvCO4r45A6t+VdFYb/W5Yl9uh3fbjCL1YPof98V406NWsKQbngiv fcL/GZ7KtxfdSHcYClU5y8Hdw2j+sPyP8HmJq/MYUC9y1HZTu7MT4ivkE1G5+ln/A2ir 2LMRHdmZxtC2INIfJmAdFUjD5w1Yw+zYrZAZXUuxQcB6fjznILZzEieeiixnMw+S8F/l DP5W0iRnd5/4Sjl8Ye0p4BbDkF9pmZ48GHG7sBUL+6Bdz7/AFgNBjuMWvzR3goJmJgl+ buwA== 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=NFU27GtWbL95WCt8F/LRedzvWo/LtApbnjc66sNmtks=; b=rMhJQzUPxX937P2dKuhZy13RYmsNbeCmJZItrSxgXnRRZLMuUHqI+3I+wBTlacTkE4 inLRNKxM8Liwiju8Vp1+3qXCbRMYuPZge1JkR/2bpUF3jeH25wBd7sY4zPaRjd9mqIUY 5UbGC8/xYOJ8wQEq5xdkCXGAsPw18DCTeS8/rzbEjPq9r4X/SsFUC1enxlvWBg2yNaIx cAvsbOfosFwlKoEkQxZjNGJ0X9owFHKo8LCgSV32LsEnws3Ar+uwX0CP23xSmKNv8nIe 7yM1w+mnIgeoS/efOvwCqHIbqrxPzx+I/stTqXJRa2PwS2h3Sb53DRiPFkfxSQZ1DM5I yWDw== X-Gm-Message-State: AOAM5325mvsgE7pNv5kITf9R9Jj1qD4+4b4NHZvZPEQwTFYVsZkyd+rl lcqQaj8d5+I9L3mpMkT21S29c/Nw9i3d92su X-Google-Smtp-Source: ABdhPJymDPmDOkSNHrHOdoAiOAhuUVRheTqBJLYFZ0ONbNVc2apw1tqvXIMsxB8eYidBcUGd0R+qoYr0kPN/EPVS X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:9c93:: with SMTP id d19mr23867458wre.275.1600204616832; Tue, 15 Sep 2020 14:16:56 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:56 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 14/37] kasan: rename addr_has_shadow to addr_has_metadata 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-20200915_171659_823497_7B0A6BD9 X-CRM114-Status: GOOD ( 15.52 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.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 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 --- 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 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.618.gf4bc123cb7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel