From patchwork Thu Sep 24 22:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11798411 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 E34F9112E for ; Thu, 24 Sep 2020 22:59:05 +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 AF8B52344C for ; Thu, 24 Sep 2020 22:59:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="a+tQydq6"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Gw9zXNxH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF8B52344C 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=gm6RFvrPNdCua8KcwQb03vKPXUa1aU4hQYNwfzzEnxg=; b=a+tQydq6HN9QP52TqDqmhK2YE JlG4wSSK/HzkjszB2Hr72kevCVeIlmmbVM9j5Ag+KINWbzhW/H56TM4vf+UyU1cgck6jD10ZWbZ33 FMR5O7zoVB+Qb4bHXpiTtMDObdSgWniNHcQmwlaPgxh2pPB+t1zbSu0swiK9jY+CHeqxSUs8WtBK7 XGgBsM9R7eoyLTI+Rofufx4YeWs0IKvsXj9KDYo/VkgiqX5ajwhNB+Vf2EMfilYzrHpt86xjtG+Rf OTYCKtEPloZl2IjO6HPrJ4AMNgqszpqGILNS35i690GoaBeAdK3i64A/lJQnCMgacPIWcaI+F5eEO a/Sk5EHMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLaAW-0004Mq-AW; Thu, 24 Sep 2020 22:56:52 +0000 Received: from mail-ed1-x54a.google.com ([2a00:1450:4864:20::54a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa5O-0002HI-Nv for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:51:35 +0000 Received: by mail-ed1-x54a.google.com with SMTP id f16so391034edm.10 for ; Thu, 24 Sep 2020 15:51:33 -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=BftCDXbWjL9wnLQzbXlcogs3AIdXjMmm0RTraZ8+u5E=; b=Gw9zXNxHUJwkXArVIbaPkoqJ5hLcOpWLVEz8aGVLUhX/OlP2SdXtXlH1782kNb/tyt ZCY0yH4lt22mOyS5iES2K2zb3N/S/AnRE9Ypumme7bdnPiBFfPJ1dNk+go9Qrld1YFoy mw07kTnsiUYIDp7lEw3JAj/uV1Q3vJjt87RK4uSinefGVEBoSYFLqMZt0kLHR2NnnmAh Y1UaoAGKT/iOrm5Qq5n9yHjHSozcxEwQAqtlBURN5pn15vix9+RtdOJJUn9pPFcIaXLI VwNS9mSYVnZc7vm1Z2fB/3pH05UJT+u3kel1GFbnluAPvr6ZozowrUcsG3EnAS7lM8pu Bvjw== 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=BftCDXbWjL9wnLQzbXlcogs3AIdXjMmm0RTraZ8+u5E=; b=ueX3Wi9MhbYPGn7Zb+HojaLYiIMlX15XXV3vti0CjuSN54Pq75aJEgXy21loBhtCEE kiC8iS4yLp4bxZJAcFKWhl+g1GJ80D/gcoN3aLgPMJW00plSrc6pASVXJnY6goddEH7W r8pnjkLn+OZ9UZQRWF5q1891jbvIIE1EOQld0sKFI6fBWpBisyxOVkxy6bGenRGCufeL 7E1ttgrQ+KyS4rCjIeNrfItDZ0CXB6D8QrGlJaOIwBB8wNUXOrJ071B+n+zj7O0mQ9fc WF2jBByi/GJtHQpMmc6h5iXkrAv4cplfTkda0+t8LAOgLWaipE+lgILAvDHoMmdH2p0Q +OnQ== X-Gm-Message-State: AOAM532sEsk5O6JvcqnsOv31ayrPVg6omoORQwas31u2ttnz+7YwEamk BoPoK5YFR7Fvk3vbBUi6KvdVbFVhFsRxEyli X-Google-Smtp-Source: ABdhPJw8iA/oUEzJjarEM4Oipxo+x/ZrAqI7GoXnog6wVz7hR/0CPnhLYc0k+ZLPCEmeXeTQjdWWH+TMP1StZ0jG X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6402:1c1b:: with SMTP id ck27mr1066322edb.12.1600987892214; Thu, 24 Sep 2020 15:51:32 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:24 +0200 In-Reply-To: Message-Id: <8580d4945df57614053084eee8f318edb64712d3.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 17/39] kasan: rename print_shadow_for_address to print_memory_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-20200924_185134_839341_C78B4B7A X-CRM114-Status: GOOD ( 13.75 ) 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:54a 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 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: I18397dddbed6bc6d365ddcaf063a83948e1150a5 --- mm/kasan/report.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 145b966f8f4d..9e4d539d62f4 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -250,7 +250,7 @@ static int shadow_pointer_offset(const void *row, const void *shadow) (shadow - row) / SHADOW_BYTES_PER_BLOCK + 1; } -static void print_shadow_for_address(const void *addr) +static void print_memory_metadata(const void *addr) { int i; const void *shadow = kasan_mem_to_shadow(addr); @@ -311,7 +311,7 @@ void kasan_report_invalid_free(void *object, unsigned long ip) pr_err("\n"); print_address_description(object, tag); pr_err("\n"); - print_shadow_for_address(object); + print_memory_metadata(object); end_report(&flags); } @@ -347,7 +347,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write, 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); + print_memory_metadata(info.first_bad_addr); } else { dump_stack(); }