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: 11798331 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 9BCDF139A for ; Thu, 24 Sep 2020 22:51:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5BFCF23A32 for ; Thu, 24 Sep 2020 22:51:36 +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="Gw9zXNxH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BFCF23A32 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 A68968E0014; Thu, 24 Sep 2020 18:51:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9F2048E0001; Thu, 24 Sep 2020 18:51:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8478F8E0014; Thu, 24 Sep 2020 18:51:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0228.hostedemail.com [216.40.44.228]) by kanga.kvack.org (Postfix) with ESMTP id 64F788E0001 for ; Thu, 24 Sep 2020 18:51:34 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 26F5C180AD802 for ; Thu, 24 Sep 2020 22:51:34 +0000 (UTC) X-FDA: 77299453308.01.fear95_13076a627162 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 00BA81004E187 for ; Thu, 24 Sep 2020 22:51:33 +0000 (UTC) X-Spam-Summary: 1,0,0,3e8f2bd1629ceffc,d41d8cd98f00b204,39cjtxwokco8reuivpbemcxffxcv.tfdczelo-ddbmrtb.fix@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:973:982:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2693:3138:3139:3140:3141:3142:3152:3352:3865:3866:3867:3871:4250:4321:4385:5007:6261:6653:6742:8603:9969:10004:10400:10450:10455:11026:11232:11473:11658:11914:12043:12048:12114:12297:12438:12555:12895:13069:13255:13311:13357:14093:14097:14181:14394:14659:14721:19904:19999:21080:21365:21444:21451:21627:30054,0,RBL:209.85.208.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.84.100;04yfpfj9871k5z9g61esw3fpnc7qgoc47pgwjau8rdjkk5hq84568yi97zxenah.nz15mq6r14idmtfunxhfwjm9ij3froxmmbn5g63sxgzyait97yastjdwrfhwbpt.o-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DN SBL:neut X-HE-Tag: fear95_13076a627162 X-Filterd-Recvd-Size: 5068 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Thu, 24 Sep 2020 22:51:33 +0000 (UTC) Received: by mail-ed1-f74.google.com with SMTP id r21so381843eda.20 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=niItImf1nHTK9jym/KBfi3MyNgTcYcPQg5KhufoinktrINIz1DBQz5IyZxKnh/kOcg t8oYhVQItMvbTBGL997BknpqVeROZOIwnTqpYNR7YFWUJLVx8FK96LLTxN3T3hY58kIj dCUkJtBSrrxbMriVIIxIl9rI5zMQ89z2uH5l1JkD3Q4a6Jb1P7Iz+IrzKLzg9vZpFbzF LU6/04YmZpWbEs49Rsj2iIlCGZ3SgW/2V69KoXUs7+1cwKQazkoF17bzE7DSSPIo7zZZ 3LzjCOqZox85Rcn0otxC+BR8EQsbDcEpfE/HhBpg2+9mg+rJvPQADK+wWTXoUHB0HKmV qXoA== X-Gm-Message-State: AOAM5308ZM3Yib6lsy+rAv9ZHXj+EdzWmQxhPdwABZFFpTEsRqDE4QJj tWAZo03eBRLfrAMWksFuEbi/v3UpgqcKnOTU 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 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000004, 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: 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(); }