From patchwork Thu Jan 14 19:33:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12020707 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 0B5ABC433E0 for ; Thu, 14 Jan 2021 19:35:54 +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 B70F623877 for ; Thu, 14 Jan 2021 19:35:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B70F623877 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=xlG0skpLhwPJsd2eXDfMWrqbt0VoIFkc972Qitq7q6w=; b=XeEPhwqoPkMkfuFynhHeFcy+l PP13MJgVQbxFP8hfCpuDxkUbUFWzzgZ6GGWLqq1K/I20nlmYAQ6r/mOizczU0CWvqI8h7fRdTSvqG fqR/UmcRIs5JbZiWKzg2EF/jsqHIObwa4/WKMf+br4BvZ9l4hFqEtcY01iTgOrmREuQnbudaai6Bj 6KGS+iNlQbFwCJ89JktsDPjVWqM+/b+ZxmTn5mw26DPiaHK2mF/Fwo25c9cZYkik2KsqWRK7AiMig y28nLFBxu8mIUNlHP9DmCBrhKwjXxNPkdsRdxkMxgLnKKDhSPcoKXcll/Kr/2NyY5HyOHfl72guA5 drkVMduzg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l08O6-0003QA-NP; Thu, 14 Jan 2021 19:34:30 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l08Np-0003Jm-6T for linux-arm-kernel@lists.infradead.org; Thu, 14 Jan 2021 19:34:15 +0000 Received: by mail-wm1-x34a.google.com with SMTP id x12so883262wmk.7 for ; Thu, 14 Jan 2021 11:34:10 -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=TionkskhfJFUpeI/OKXUNvEID4OHoy9zg6Ffh7JmH8U=; b=Tmcmrez4gPLu4Ao5W6Ccspbbz/R7JDIQvAnzbn+3G4Nl+qd6kld//XQZFt8zyyKRHg yOZ6Hu2PtRCHValTBXFNafp8KmlGrnUDUAXIIy2UqKUlLWABYeG9e1tSa5OwJT7R1/P7 Rl6SImK21+uKZNX8VftBxTn6OW6YV9Aaog4tVh9+FKNf0qqtQzHnB2JVq8UfhfrB2ubN Q2jDUtL3U4qTeMG5T6Ebd7+wLZB4itXhgaGrwHMrFb5yfK+U6ZC9NWkwlcdo68gvP7YH W/Ko5xuUT7nB5U95hBn1BCKSkOqOiq7PFoxyUYHGWJ4/r702Cvk4YkGK2S/Rl6thA4Aj lk+A== 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=TionkskhfJFUpeI/OKXUNvEID4OHoy9zg6Ffh7JmH8U=; b=c2rGBnT29Aus3C6lsTx0l9EDHEC8uzJh/XpBBkzSNdEdEkelno9r9dHo77Dsfo0WCo xjrd7nTtC7v87bpFSeFSkOltZiVhMYLrf6UiUcEICpKSNHDoKmTnwjAkR4NELm7EqMV8 UzMfvIW3PDM1C9lt0b/R/GMyjoa9XAGOp1/gccl+PI0aRlToPA5qKY4ROgjnB55S9iGD Eewi96aww0kVU7h+TrhIuwJYhE/EAeQQHV+stf5Vxjld5ou6LcQTto5LJenV0eagEzxq h8Rk5N2MmW32OpEOF2mQF8Ld6hDjfOU8iCZUZDqgbM8xjPi1szUoBswt5W7rJ7XUP7uQ TnzQ== X-Gm-Message-State: AOAM5303OYZs6jYvJGoHGkpSC1ZoNIRVKUbFCi0CML8DC8xB2NX+ZLy+ N6pMGoRy85MOkzDyHGvrUL+jd5+1YsYxvbPM X-Google-Smtp-Source: ABdhPJylLY1qXjASFBn9qVlbl1hTVHoUqtlGUBIy0x809OMseLmfOem7fnoyJjhZNOnosh+W97YAAaV/IKXRcqtt X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:600c:258:: with SMTP id 24mr5507364wmj.16.1610652849704; Thu, 14 Jan 2021 11:34:09 -0800 (PST) Date: Thu, 14 Jan 2021 20:33:57 +0100 In-Reply-To: Message-Id: <3d9e6dece676e9da49d9913c78fd647db7dad552.1610652791.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH v2 2/2] kasan, arm64: fix pointer tags in KASAN reports From: Andrey Konovalov To: Andrew Morton , Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210114_143413_300489_ABF41225 X-CRM114-Status: GOOD ( 12.62 ) 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: Branislav Rankov , Andrey Konovalov , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As of the "arm64: expose FAR_EL1 tag bits in siginfo" patch, the address that is passed to report_tag_fault has pointer tags in the format of 0x0X, while KASAN uses 0xFX format (note the difference in the top 4 bits). Fix up the pointer tag before calling kasan_report. Link: https://linux-review.googlesource.com/id/I9ced973866036d8679e8f4ae325de547eb969649 Fixes: dceec3ff7807 ("arm64: expose FAR_EL1 tag bits in siginfo") Fixes: 4291e9ee6189 ("kasan, arm64: print report from tag fault handler") Signed-off-by: Andrey Konovalov --- arch/arm64/mm/fault.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 3c40da479899..a218f6f2fdc8 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -304,6 +304,8 @@ static void report_tag_fault(unsigned long addr, unsigned int esr, { bool is_write = ((esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT) != 0; + /* The format of KASAN tags is 0xF. */ + addr |= (0xF0UL << MTE_TAG_SHIFT); /* * SAS bits aren't set for all faults reported in EL1, so we can't * find out access size.