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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 CA810C43467 for ; Mon, 12 Oct 2020 20:45:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7097D208D5 for ; Mon, 12 Oct 2020 20:45:55 +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="XY3o8GYc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7097D208D5 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 06C1F940021; Mon, 12 Oct 2020 16:45:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01A95940009; Mon, 12 Oct 2020 16:45:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4F04940021; Mon, 12 Oct 2020 16:45:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id B1A2B940009 for ; Mon, 12 Oct 2020 16:45:54 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 49421180AD807 for ; Mon, 12 Oct 2020 20:45:54 +0000 (UTC) X-FDA: 77364455028.29.vase84_471640c271fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 1EB7D18086CCA for ; Mon, 12 Oct 2020 20:45:54 +0000 (UTC) X-HE-Tag: vase84_471640c271fd X-Filterd-Recvd-Size: 6122 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 20:45:53 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id 33so9782103wrk.12 for ; Mon, 12 Oct 2020 13:45:53 -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=HoLd9axH/k8QQMpteaotxwKQuIlysE8DbXq7dK1Bu7s=; b=XY3o8GYcVeXTWJxSYYcN4Tq0Qf6Dd4npKRj6tPkEfKejjRbkBXsH9dNK2QKkbNfSAP 3wGO1VWMBhaRsZ0pALaWHCnbCA/93SIzJPuFN0+Avvz00Owwu9GNbzAf9SLPpQX0yuNn urbEXjcvana0wWM/s+yU+ZkNa4f3DyBSqCHrBlwiDZcc0YKWyOdwoIyckOzdKJbY5ByM AFfAKk8sKgzzUI1SRnOqljsyd8d/NXAAfeJ8vsoBwdW7zzIforlmjFN1APpMhG6JuKg1 vUwy1nWtaID5P1gswqnxgwTYgMHlw1RQ1f9b4U++iLRs7O7gQjwI6vPgmUE1tA5AFapH ghDQ== 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=HoLd9axH/k8QQMpteaotxwKQuIlysE8DbXq7dK1Bu7s=; b=sVpKGjIahmFKdOI1Csu2CR3A9P/33m0MlRdkDzORZPrCkdj1L8G5bdFPk8gVFeWy1y 54kdrdmbbNeedNoTsGe4Q085V42zJzAPOZW7MQ5OpBuL2B9/Qot7PA4nbRovH9Tz6mi5 nEv3Fla0+ZFm8CqRkxqr3J63cUcXGNUNWamakp3TyfCzUPNswF5rcVfL0KWMKF3ALU2d fgFh53pIxYKIOXVOk6KeOAFSpzB6JdeTfIHQXU2EeYVIiTe8AMv4iZUB0YynUkow7Z9h APg68Rz5IEzaVeo3dRB7sj5UgR0QzIdLLoMR2aQtBXmsPFWrY4RVjWBoht5BnEWQL1Yp CR0w== X-Gm-Message-State: AOAM533Z8oH9Gf/CHkOWq9a29EJuODAZukwBFDrF8U/BFk4noLxUxp8i D7NqTj5S4iPlalhdbHoi7o+jCxQDtSadtgFZ X-Google-Smtp-Source: ABdhPJw2nSU3hWlZtLeQVa82TF5eU/yQ0RYpKi0b/RntwI/o/Z+SH09IR4jADBKzL1OGj1qsky0/sraUZlTxC5Ku X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:6488:: with SMTP id y130mr12073548wmb.94.1602535552445; Mon, 12 Oct 2020 13:45:52 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:31 +0200 In-Reply-To: Message-Id: <21b75a558884793bd6fe13dc1e0a263381b2cf82.1602535397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 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 Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000277, 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 5a69472eb132..420638225c13 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 91b869673148..145b966f8f4d 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -329,7 +329,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; @@ -340,11 +340,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 42b2b5791733..ff067071cd28 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); } -- 2.28.0.1011.ga647a8990f-goog