From patchwork Thu Oct 29 19:25:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867223 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 764ED6A2 for ; Thu, 29 Oct 2020 19:27:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1DF2A20796 for ; Thu, 29 Oct 2020 19:27:12 +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="EdQyVtnk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DF2A20796 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 77E7D6B00AD; Thu, 29 Oct 2020 15:27:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7074B6B00AE; Thu, 29 Oct 2020 15:27:10 -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 5FA786B00AF; Thu, 29 Oct 2020 15:27:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 10EFF6B00AD for ; Thu, 29 Oct 2020 15:27:10 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id AC1AD181AC9B6 for ; Thu, 29 Oct 2020 19:27:09 +0000 (UTC) X-FDA: 77425946178.25.fifth23_47128cd2728f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 87E951804E3A0 for ; Thu, 29 Oct 2020 19:27:09 +0000 (UTC) X-Spam-Summary: 1,0,0,317f9251ce812cfb,d41d8cd98f00b204,3jbebxwokccshukylfrucsnvvnsl.jvtspube-ttrchjr.vyn@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:982:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2559:2562:2693:3138:3139:3140:3141:3142:3152:3353:3865:3866:3867:3871:4117:4250:4321:4605:5007:6261:6653:6742:8603:9969:10004:10400:10450:10455:11026:11232:11473:11658:11914:12043:12297:12438:12555:12895:12986:14093:14097:14181:14394:14659:14721:19904:19999:21080:21324:21365:21444:21451:21627:21990:30054:30075,0,RBL:209.85.222.201:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yrpb5kp3q338ymf6hu5p9x58qicypp8xs4neqry48t6hqc39n8ow4t1oetszc.z4az4mjq3kyk668o15tyyzd4nqmunbsbo4b7xx35y8u5gcobsehmgricno74y9p.4-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: fifth23_47128cd2728f X-Filterd-Recvd-Size: 6125 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:27:09 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id z16so2435973qkg.15 for ; Thu, 29 Oct 2020 12:27:08 -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=MeYcqtBqx2zX9SLBJun3MMNhtoyJ+Q7swKHdtnpeAZI=; b=EdQyVtnk5oIdkHXSrYNqXluy+vnS9IpQY3kz74ohd3i/ZHBNLb+B7EssrfgXp+/o61 ps7KHvD1JWOR3oq4+3O6yw8MF7jwL9MtjwphBS1VkS3Q1qymHbVki0HR5ILCHdBIEoF4 hvL90JkEXHrWHBHSqNqYdE3Z9841+clUpWYK78N8V9aBJffHzMKVixcu/rqFed8HmRnU 10LjLEnXCj4yvnzh31J2o6KIQ8p9S21+VfIXC7ClRQuBqdVqMEkZInOYizHPXp1qrZyo Qa1MU0C6dgFuXjPsUQQmNeLXnzZtSDD3h0e0qFNMoPACgdyK3k8qehPg/lAGcuhKOx+4 7nZg== 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=MeYcqtBqx2zX9SLBJun3MMNhtoyJ+Q7swKHdtnpeAZI=; b=o16ZsTn7EoVzAnXs9ek8Gpi3JC1PlBYmpCALWTMxiP1FIMNYpP1c/k3svuDDA0pYr1 3i9Poja0ynCh0F9p/5Zf2g8wXolgFn9lDIKdDa49AaS87QppjWTgkAXWUXviGqLxkknG kW/ZZI5hzIsnIAAIUQUMKaK7sp68eBs2fSoWlM9xMAwFu91oMbilhZe4al0BF4jvWXQU FNhDB71NU3jlAWR4EiWK8+EpvbgdD9CVGYsNkoiOQbUB428C95isuDL9TU4QL1QYvFqr FlYvDGMB0hg/bl8R2R4U139iIPSi/sbLGPa4+fb5nfZuofauZBEJ2+C/osvrEAwYDSvv 4Yrw== X-Gm-Message-State: AOAM530xuQAKoDMKO8lUyTOAFmteAk+Z6Kr1Ut9nvFThwFsa++8WDFmG q+F8Q5pWNj4pN03XSdnvqSlRx+ep0ACsej+u X-Google-Smtp-Source: ABdhPJyvnzlbDy1/Se0dIgeRIc1atmx2qGfrYuygjD9RIqBwuN5omzxBpg8Ug1XNxDBrisw2tMuwbimwrH6il5JB X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:ffb2:: with SMTP id d18mr5644573qvv.44.1603999628350; Thu, 29 Oct 2020 12:27:08 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:46 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 25/40] kasan: rename addr_has_shadow to addr_has_metadata From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , 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.000093, 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: 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 2b8ca8f2aed3..139fc52a62ff 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -146,7 +146,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 af9138ea54ad..2990ca34abaf 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -361,7 +361,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; @@ -372,11 +372,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 589b1875f5e7..363afde3c409 100644 --- a/mm/kasan/report_generic.c +++ b/mm/kasan/report_generic.c @@ -117,7 +117,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); }