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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 4CDCEC433E0 for ; Wed, 13 Jan 2021 16:03:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A089023434 for ; Wed, 13 Jan 2021 16:03:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A089023434 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 16D198D0062; Wed, 13 Jan 2021 11:03:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1440B8D0061; Wed, 13 Jan 2021 11:03:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 080DC8D0062; Wed, 13 Jan 2021 11:03:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0038.hostedemail.com [216.40.44.38]) by kanga.kvack.org (Postfix) with ESMTP id E34008D0061 for ; Wed, 13 Jan 2021 11:03:43 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 96D61824556B for ; Wed, 13 Jan 2021 16:03:43 +0000 (UTC) X-FDA: 77701222326.09.gate97_5d00e062751f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 0AE0E180AD822 for ; Wed, 13 Jan 2021 16:03:43 +0000 (UTC) X-HE-Tag: gate97_5d00e062751f X-Filterd-Recvd-Size: 4564 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Jan 2021 16:03:40 +0000 (UTC) Received: by mail-wm1-f74.google.com with SMTP id b194so404185wmd.3 for ; Wed, 13 Jan 2021 08:03:40 -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=CDyrzARrVWFbuNifeul+Ll6GNbUn3MtdKoa0QdzHXSOPzMxbXAa7Z/FvEsSB2IPRrW enMrgXSKOeK3msMJO/vfXcb+9JOTd7R8a1VjRZ/ULWPr0g5AiDXOpZfbVIA7QbmrjjLC fpV17EGOTCPZOpybyXa7JbPD6CKpgp0WKU6sVKxPLH+PNidH+RTGfKve7sdwxM0Z16FB LWD2vekX5jUN8zAAl7Sf8PityLr6lD8t0vPjkwswCG6Ru8XRUIb2jRtx4a3ElWN9jXGD 4CcvIiyT7b2Su7QJuJPuGTsoEbbxb2hkmLg2nDCnYXnMLK7KB4hqQnZEwCeqZha6aiPI OYfg== 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=r2BRuTT8FCG6Skuj5/Q9YXNy9aXyw26b+Pv0fSwy2JGNIiaCLkwrilYZvRU77HUFUm 6Fk+bApve0sAab7V7cBBsbUPCfJ3QTavvoptrTUu/Raxnk7X0pF64ilom888SpgTJ9te yMa0YNf/FtFaaJs6x80SQhAlnvIhC/O9oi88TkvIxVbBrOxRlULK565YFYFo3Q5zFF7Q +tXtDh6FSAjRKHPe4/DMyPB5RAotbEYa5cAks7ahsKAgffr/zCUcZXjWRIsAtoLwZkso Qrb+8me4KvZrLWIVF8dOaX11vS3oXbOCsJhdO4fl784uOTb3LV+8kjkjGwHG3etLoFQT Mblg== X-Gm-Message-State: AOAM530fYE94f6P/SnECIJ+wltfiAqdSwkCaowJOznIft+RMgaHB3h74 SlGyIUVSOkJlvBky4Ao8htKa504h88aK4L8o X-Google-Smtp-Source: ABdhPJxqarOEyeKYbqGN5d2jvJR/uvZGjSvQgP26Nb2T8OhUp0hSrBOuQZdB1FVfKQ+fxQyDVc8hMJzo5rC3Fwoe X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6000:222:: with SMTP id l2mr3287308wrz.392.1610553819541; Wed, 13 Jan 2021 08:03:39 -0800 (PST) Date: Wed, 13 Jan 2021 17:03:30 +0100 In-Reply-To: Message-Id: <1965508bcbec62699715d32bef91628ef55b4b44.1610553774.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH 2/2] kasan, arm64: fix pointer tags in KASAN reports From: Andrey Konovalov To: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Andrew Morton , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, 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.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. -- 2.30.0.284.gd98b1dd5eaa7-goog