From patchwork Fri Jan 15 17:41:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12023487 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.5 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 B6063C433DB for ; Fri, 15 Jan 2021 17:42:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6A1AB23A59 for ; Fri, 15 Jan 2021 17:42:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A1AB23A59 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 E20908D01C0; Fri, 15 Jan 2021 12:42:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF6F98D01BF; Fri, 15 Jan 2021 12:42:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBF938D01C0; Fri, 15 Jan 2021 12:42:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0208.hostedemail.com [216.40.44.208]) by kanga.kvack.org (Postfix) with ESMTP id B2A248D01BF for ; Fri, 15 Jan 2021 12:42:05 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 72946BA1E for ; Fri, 15 Jan 2021 17:42:05 +0000 (UTC) X-FDA: 77708727810.05.wine24_210b3b027531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 45F4A182B1DD7 for ; Fri, 15 Jan 2021 17:42:05 +0000 (UTC) X-HE-Tag: wine24_210b3b027531 X-Filterd-Recvd-Size: 5010 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:42:04 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id o12so4412264wrq.13 for ; Fri, 15 Jan 2021 09:42:04 -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=2Jh+PMvtwPBdOf35KI8y5U59fASZU17QcTjkcKex3tI=; b=Hd2IN4XMaOhARll1q80OAre7pjVfYDxXAVwkYziln0JBQl6QbZlfrmyN+WlNgylyWU pIaRrBzcotlT2eZMrDvmrnwfyeoANkWceg612cwXsWqYdVaiErMhEKNDdohjPzMPYd/H 55ovgJKab/CQUxTOgOefpS+wa9DeexWd/gKfu1rB2+Upw5JdPIdRXP1uyvJUjtq21IxU tseFZahjTU9om4RhlW5xYn0HIsNnWgBJ04W6+DTt0sdqmXFQvWtH1AiiUPDkQ2hkPbF5 T+aqk8C3k5N9mZhTqK2lNPrt256CFiYczEGa0r+9tU9/1NEzYb8n3fshYQ+XiSG6hS+P BrPQ== 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=2Jh+PMvtwPBdOf35KI8y5U59fASZU17QcTjkcKex3tI=; b=QXU+hp45gmkjOKUnFbvFBi0NYV+zoTlhjK3MBx1LhnxV2LS7GEpME8350jMRO5Oovw o72TR/SnTi9zkq9P2kM1INOdByvCfiknPx8SQSNygLI6ZDttDpofggnyH4IR7jHx6bV1 QrarIGNBX/LMfpnEQetFZmV8NApiq3WBZrXZ0yXSMHffhTH14/wg1rlBEvfHPBbT5cKw dlkCNlwnG8TNH2TnOLKQNYv4utQoX5sF9xll8CTHIk408fHIB1rpifEA8hYchZ2RVS5H a0Isn0L2mwHNQdgiM8r2Pi3bkqRJFUMM+SCryRtXXonUe7A3YatG1UBthKmSztOwg/F/ /f9g== X-Gm-Message-State: AOAM532lBbx1RJfvGWokE+OqvFyYRApP7ENXcs07jm4GXIkD1qc+Lojt 48csPbSwiowkljvAmcnmzPyIsDnbN/HsWZ2I X-Google-Smtp-Source: ABdhPJwtveqVzh/mz1rxuVT8+JjfpWP10vB1hMpqRtgEBmDO+OrhmMhVsyLbeqMFYIRBQSX7tuyjEk70XhttOV8N X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:58d7:: with SMTP id o23mr14634604wrf.288.1610732522952; Fri, 15 Jan 2021 09:42:02 -0800 (PST) Date: Fri, 15 Jan 2021 18:41:53 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH v3 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 Cc: 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 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 for kernel pointers in do_tag_check_fault by setting them to the same value as bit 55. Explicitly use __untagged_addr() instead of untagged_addr(), as the latter doesn't affect TTBR1 addresses. 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 Reviewed-by: Catalin Marinas Reviewed-by: Vincenzo Frascino --- arch/arm64/mm/fault.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 3c40da479899..35d75c60e2b8 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -709,10 +709,11 @@ static int do_tag_check_fault(unsigned long far, unsigned int esr, struct pt_regs *regs) { /* - * The architecture specifies that bits 63:60 of FAR_EL1 are UNKNOWN for tag - * check faults. Mask them out now so that userspace doesn't see them. + * The architecture specifies that bits 63:60 of FAR_EL1 are UNKNOWN + * for tag check faults. Set them to corresponding bits in the untagged + * address. */ - far &= (1UL << 60) - 1; + far = (__untagged_addr(far) & ~MTE_TAG_MASK) | (far & MTE_TAG_MASK); do_bad_area(far, esr, regs); return 0; }