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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 3BEBBC4346E for ; Thu, 24 Sep 2020 22:58:34 +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 B192D2344C for ; Thu, 24 Sep 2020 22:58:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="akdxgSnE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="pSVeZJ+M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B192D2344C 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+linux-arm-kernel=archiver.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=d5Yws4bqMHHmxsK0IilUM9Z/aJ/zkHBUCIZ/WMFkfCc=; b=akdxgSnEgqQKkL2xZ8A03On7y VBaAiUWJcvhDsJ9cvSWuYSCY1tlFoeG/Hqby3M5sN2jOOPS9tqGaRVoTRNNWvp/LhfhlPyfD3RD74 OAnPptbpeBX+NpreV+fhG18ip0zArFM2naORe34enQ5101egLt6Y4gmwLhQEWyPsRHtjFLaFI2E4F Ffc6ekYEVyG5nJfLUq8hRHGXbt2yGK0R/E5xhaRwoqCQoINeKWgeofddUdvfBLfs+VvhIhdJyZ5dT A+nBvAu/iKHdPlUsSd5SlYWdOG7YhXfupuj5gn0A6uK3iPw+XnAqjyMb5yoeYF6rni9Ycm1Tln4Db RQ3j2QIKQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLaAC-0004D1-GH; Thu, 24 Sep 2020 22:56:32 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa5L-0002GA-TL for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:51:33 +0000 Received: by mail-wr1-x44a.google.com with SMTP id b2so289902wrs.7 for ; Thu, 24 Sep 2020 15:51:30 -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=hIFfthxFzKDNttx6Iwa15uG/YA2TsOtV5/OtZQz4D6k=; b=pSVeZJ+Mo6ZWifAuS+6KCEX5EJxKTmAawvnqmG+62ZIqI8wE8ZOk0hn0O9ns5i2phJ s30NK/lLkW4w4L5khmsq9riWXwa4rx2E9xlWXa8+LKwc7CbFbOEN/lADZOIP/YKrXRtn YpE/MgV5UV3uzh/LVu6RAIxKaLLhiLAgSHq3qmj+5EjUaE6ZTC1tMHPT5HmfU57+t1gG DUEpyJCz72NrVP5uQQDxIChAaeWFPv0hwiQqM1HQAM1FJ8D02vTkVZ8fkZ1YAdVf3Xj6 eIDapAyz+LWvq5r52TLARW0wYAs5rMBZHmwYG3wFPOXmGb2hAq7rsNvwXd8S6rw9nAKq 7oqg== 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=hIFfthxFzKDNttx6Iwa15uG/YA2TsOtV5/OtZQz4D6k=; b=D1JQ0SYQ1DtPpO8MA1rdZHrBba8hJkv+dADFsReNoQWDKENHUvO3vK5QBcHxZG6oZv PyKJmILzH9EgrWX13JE0GCB7JWOaG1JeRIas5QqPtDgrjQomEG5QqR3+RZkx/TqkkVBo 4MQp22MAhie7JWi88GhZTUTYGuhb7TZJRPkM+5SzSBXCZ4uf8uYA7wiUJZG7QgfM5/z8 X0alYXIJyPEB7L5/LzE9hPv4uN3fHoXLNEEef/czJbAilw8lu33e/fHBsurQvYJ34tnL 24IQcKj2CYqQw4B0uCu4CHBQ1X9D5BQfzMa1MWViUzFopZX31V5n2NuzOvATtEf2YF8n ctjg== X-Gm-Message-State: AOAM533s7QhnZBy/HTyiHHXa/ZoIDbhH1f1CEEeWdq1xtm4M2kkYoccp lG/k/tAyJVQK7H0Z+bpEZ2n4X34TDZunViDZ X-Google-Smtp-Source: ABdhPJy5ULe6GUSQ5xDjMfDpd+cYJ8T54lZ2I/FeR/jw8GWQfUtfFJA8p7zrE57Z9aqLqoVj7Fe2KFlpULY4cs7D X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:60cc:: with SMTP id x12mr1196294wrt.84.1600987889651; Thu, 24 Sep 2020 15:51:29 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:23 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 16/39] kasan: rename addr_has_shadow to addr_has_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_185132_014722_3D52C478 X-CRM114-Status: GOOD ( 15.01 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.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 --- 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 8dfacc0f73ea..0bf669fad345 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.681.g6f77f65b4e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel