From patchwork Tue Sep 15 21:15:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11777743 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 CC2516CA for ; Tue, 15 Sep 2020 21:17:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 937AE20770 for ; Tue, 15 Sep 2020 21:17:03 +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="pe/gphJl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 937AE20770 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 DF6C9900082; Tue, 15 Sep 2020 17:17:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DA73F900012; Tue, 15 Sep 2020 17:17:01 -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 CBDCF900082; Tue, 15 Sep 2020 17:17:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id A6C66900012 for ; Tue, 15 Sep 2020 17:17:01 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 440C3181AEF09 for ; Tue, 15 Sep 2020 21:17:01 +0000 (UTC) X-FDA: 77266555842.16.jail18_270a5fd27114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 155D4100E6912 for ; Tue, 15 Sep 2020 21:17:01 +0000 (UTC) X-Spam-Summary: 1,0,0,022c079308592f69,d41d8cd98f00b204,3sy9hxwokcdamzpdqkwzhxsaasxq.oayxuzgj-yywhmow.ads@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: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.218.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04y8e7yeoynns3jbwj8b3a9kecsniyc47pgwjau8rdjkk5hq84568yi97zxenah.nz15mqssquzwzqdbnxhfwjm9ij3froxmmbn5g63sxgzyait97yastjdwrfhwbpt.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,DNSBL:ne utral,Cu X-HE-Tag: jail18_270a5fd27114 X-Filterd-Recvd-Size: 5063 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:17:00 +0000 (UTC) Received: by mail-ej1-f73.google.com with SMTP id d8so1841762ejt.14 for ; Tue, 15 Sep 2020 14:17:00 -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=LA/JoGm8S/g3KI3imjTGafEDoL5GY8vPZ9zGXBZ3JZQ=; b=pe/gphJlmzAMPX95VYWAWtz0vwnZxs6ztYU65lG5adc1Tsk5t16qxRObv0Fj78BTSJ iwSptltcdPvW3+OF4mGCnZhaEWg+JrGEY7fltofc/Uvy170czTjYtmpTqrQxeO5cTors DUkW54UUWrIAkCn04SZt8YY9jW5LRnUzG6pS5MQwXXQTAk0P0ailXdGkYLXtFL+GcfEX gb8feGkSX2iuI9vchI2EWoWLx66sPY4tCZaZrM1jB2aASttRsRkr5F41mNUodOkeEiRD 1rp0p3F3AskTrLyn7OweXmv7p8Y7CNrOic+Q1tm4c8J7xWeFzo5nr9q/+g2CvECOo/2D 7Ydg== 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=LA/JoGm8S/g3KI3imjTGafEDoL5GY8vPZ9zGXBZ3JZQ=; b=hakF4VbzZuyVTS2YN6OmZu9ZtQ2okVZgifUuKREGfBL3MTtWpJL+XyuXr0tWtNMd+Y t7qBrL3NAlep3czXlJ3a8c9PglAMCnLagBYU1yq1zI+XdMZ5PxXA49t92Kh49D18GBCz 0mS+hd60Dmy91pl2GQ1BhOFCMycYAI9fP8rHVwIoxY01gssSpo3Qu/gDoxipfxlRBht4 Nf90TaQEsaurCPVy/AtAyOm6YXz3APxagC5bWGX1CkqcmKffKTjz2RzuMNuZWYr54L1x 10s5XtI5v4JC1jylT5dTLiCUCVvWingnqIJOETLBCOItMUUx+uK18o0mMnOwwmlsQwEA 4yoA== X-Gm-Message-State: AOAM5304HooxfFenTqsQReBK17ZkSxfIiUrdplPvCfieOW4bneQo/sqR 8lITluDL/3Q/jggsrsCdd6ZuvBbbaiE6T2tg X-Google-Smtp-Source: ABdhPJzHKloR/2nKSDoHn+YLky9R8AWO2YdB/ozJDPuL7EOFOdEaeBg49qPy/gRjjmd0lXtFLrzQSULF0gOQ3rhU X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:aa7:d30b:: with SMTP id p11mr24645433edq.80.1600204619159; Tue, 15 Sep 2020 14:16:59 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:57 +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 15/37] 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-Rspamd-Queue-Id: 155D4100E6912 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 --- 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 ada3cfb43764..8ad1ced1607d 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -255,7 +255,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); @@ -316,7 +316,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); } @@ -352,7 +352,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(); }