From patchwork Fri Nov 13 22:15:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11905017 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.7 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=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 83BB4C55ABD for ; Fri, 13 Nov 2020 22:26:02 +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 17F99207DE for ; Fri, 13 Nov 2020 22:26:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aQksYAXp"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="pUJ0TD71" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17F99207DE 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=1/neBq8jhDq1wQbJ8SMGozkF11Jqwgip+rhQ7sN3ceA=; b=aQksYAXpz4JEaKR2W/TM1y7ft jAT5XjCXBNwQstN/9XW7wA9GbKt7rkgbgUIO5DMhx0RL45tYGLxBfVM8+6xF22Y60MApsxcUo02hf qBqWHcPKrqRV99agU7jCK6JsloT42A6UIq3sw1/LRlLBSkwg3S8+9w8zC0WaRnTNXzlD9Tr/HhYE+ wN6o/IxT52mOZUS8SIFvOjkp8GIrKFbZ6u/863KV4KbdfWF1xV2Ebkv8lzSKcU6EZRQCIDmurwAh3 RJNu/rnZPVTGIjk9eAuwcc63ANB63PGiFIDcLMV5MGZ1Guu7ILhbC6+MWDyVQWKl0AzckhURf+ku9 1QuWZh7WA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdhVQ-0003gf-Jb; Fri, 13 Nov 2020 22:25:20 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdhNP-00008D-Vd for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 22:17:22 +0000 Received: by mail-qt1-x84a.google.com with SMTP id v9so6603899qtw.12 for ; Fri, 13 Nov 2020 14:17:01 -0800 (PST) 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=nOCTDQ2//vgboByM6FE0MupdQKKhq84DcRt/L5d/bIU=; b=pUJ0TD71SNEkUOHJeTjjBfzEM8gR3vF6yLGkhb/LGE1RQ6XREtfpEFbvqyJTi6UhiP UtxslOoetmpW1a5g2b+sdhGhaBGp0RYD2+4IAOcdnDY6uN3SkwUTIkXDW+t3WLz4Zaun utzi3Mc8b1amh3TpprE8m/R82X/YaETzQ9STrGv5x3gYZJtTbOIpC+tBf6PX5OyNt8zm eNx1aZwyJce6efFgsvI5hKYK69bDVlM8ztK21jCQdg42tnVqB/lEdoZFYZtxh9szA6yH 7EoqE3SP3D46FuEbksoyuKPqfbc+9axbWagrOF2Da/mpwWZFuwc1LG0QM8IzGx1zCJsA UWIg== 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=nOCTDQ2//vgboByM6FE0MupdQKKhq84DcRt/L5d/bIU=; b=ev0MANyb5O8Gp8yUjWZrYoo3wtW0UB0mrpRiYas/jCdrU/HEA8I9W0BRdrUsXFsIsk 3aqqUOU6HwZ7x8VL6JQCgbia5bHcoDMg+YwXZ9TYQBmJnpm6coHZWc5FqzrPNhwsfGpz V658q19vDUL9pPbApKnWqTtOO7bK49ijE32/mT9w7MAGkCKkEQFJYhbnsdCZ8b9QjvTz If+i3S+VVGEw4O6ovuz9M6Kg9Fd9hV4r+dWCQWqjlsf0IN9O+Bmcar2zpKxBZPzm774T 1joIlDw3YbVJn/yQYdyNR9el46dNf02BNCfXXyBN7zWAVZSF8kVnDypUsLfd2nISGQpL lhMw== X-Gm-Message-State: AOAM530QlwD13u4leE3Qm3rHFFaDtASUIq1/R/nQB1dhgFx+ZpwuGRSV ZQQ8uPLpjQOPGp6nLK1VPGxc/WOoJY4c134Q X-Google-Smtp-Source: ABdhPJwGq3taGnv+tMdZUqUhQYyJtlfq6IIl2c2wR89qSzm0PXGktkQLorogdBCr4tZLWF5palX037Ak2mx5t9Lv X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:c2ce:: with SMTP id c14mr4724618qvi.20.1605305820567; Fri, 13 Nov 2020 14:17:00 -0800 (PST) Date: Fri, 13 Nov 2020 23:15:47 +0100 In-Reply-To: Message-Id: <4bc8a39b683988a2c672a0d99df12eee1e3c85cd.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 19/42] kasan: rename print_shadow_for_address to print_memory_metadata From: Andrey Konovalov To: Andrew Morton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_171704_116636_0095BE84 X-CRM114-Status: GOOD ( 13.96 ) 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: linux-arm-kernel@lists.infradead.org, Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Konovalov , Andrey Ryabinin , Vincenzo Frascino , Dmitry Vyukov 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 Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko --- 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 2990ca34abaf..5d5733831ad7 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -252,7 +252,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); @@ -338,7 +338,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); } @@ -379,7 +379,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(); }