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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 E288CC433DB for ; Fri, 15 Jan 2021 16:30:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4BC1A233CF for ; Fri, 15 Jan 2021 16:30:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BC1A233CF 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 641FD6B0116; Fri, 15 Jan 2021 11:30:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CD798D0187; Fri, 15 Jan 2021 11:30:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BEA76B011B; Fri, 15 Jan 2021 11:30:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0186.hostedemail.com [216.40.44.186]) by kanga.kvack.org (Postfix) with ESMTP id 31AEE6B0116 for ; Fri, 15 Jan 2021 11:30:54 -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 E19A340D7 for ; Fri, 15 Jan 2021 16:30:53 +0000 (UTC) X-FDA: 77708548386.05.cart37_010498227530 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id C1E0B1814B0F3 for ; Fri, 15 Jan 2021 16:30:53 +0000 (UTC) X-HE-Tag: cart37_010498227530 X-Filterd-Recvd-Size: 5860 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 16:30:53 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id t29so689541pfg.11 for ; Fri, 15 Jan 2021 08:30:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uEsRmwU2Zg9Pm7ZYfxs6cFkd37PnI+Hzer0Thh9MkrA=; b=mjEuakf3LELUuf14yi0qZ2kkoyW78JDYiY2+E/aYX9liqbWOU+kVCGRcbmmqHnVZ4N BZlHrO6wAh+v02tq2xVEgCgI/PIl66nBPHqZWmG+ZMJzcDLpSAMa3ykuW+SdkmHUMKvW 9PzSNMhzVAvfegD0kw2DeEtvQvhDpmmPm4TmUW+Xr5hhatxld3zRZPaOshOsQFkM73jV OUpQE69cMn/aBjozPXVTURZfY7M1G9ZcO3qrOAbedHg2MI+JA1NTtD/e8RIFvrddBJ5C XVp9YuGAzKdzWvAIm32jSU63V1tuPozCQ/DgK8cgiRvxAMPWkxsrRntUCJIJTz97F8N6 KPfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uEsRmwU2Zg9Pm7ZYfxs6cFkd37PnI+Hzer0Thh9MkrA=; b=IBopPnAZnhbcdt27yTVzUFOARhbyXycTXMXgeSoLQRphnubqo7R6VKew+CpYLUSo7Z veswz7vNSVofGijGcx0Wlb3yqmIy0BW8a0K4JEL0aKRMBYAfuFIRao8YCkXbKt0hXMBz Fpfo5h0Cy+g6TF1g2S1kTLEDR2/uTZevfl2wm53OnBSArJ61G3kqbPV9PudpTFY1U58m gwU8A9OxXDGbGWptGwFx1z4Tb3ZHMkaEXbUXCv13mWAgl6+SZWxVxDkAvjvVQLlk8mpA byOUnntK+9ywBLzY3+0T5RyG6mnOvWGuRMlotf26MrdLbv+zKtnDfS8b8gfTFsWqQOHx 7fKw== X-Gm-Message-State: AOAM530iTZQzoOhQANTsHac4DTCmHTh1/+UDwgap8fecaxhPwvoE3STt MfXWcnhBiQVMRr3HUJ7IFeLIKgInSEkPPjNgZmKtnA== X-Google-Smtp-Source: ABdhPJygTqWrqfXQl+LwpvjBXUDWBUPUCYqWkZlbDeDTV6dmnmVOHnwRaZEPJ9H/Thwpz1E6NBRIcAzspA7rzMSCRJM= X-Received: by 2002:a62:e309:0:b029:1ae:5b4a:3199 with SMTP id g9-20020a62e3090000b02901ae5b4a3199mr13127964pfh.24.1610728252059; Fri, 15 Jan 2021 08:30:52 -0800 (PST) MIME-Version: 1.0 References: <1965508bcbec62699715d32bef91628ef55b4b44.1610553774.git.andreyknvl@google.com> <20210113165441.GC27045@gaia> In-Reply-To: <20210113165441.GC27045@gaia> From: Andrey Konovalov Date: Fri, 15 Jan 2021 17:30:40 +0100 Message-ID: Subject: Re: [PATCH 2/2] kasan, arm64: fix pointer tags in KASAN reports To: Catalin Marinas Cc: Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver , Andrew Morton , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev , Linux ARM , Linux Memory Management List , LKML 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: On Wed, Jan 13, 2021 at 5:54 PM Catalin Marinas wrote: > > On Wed, Jan 13, 2021 at 05:03:30PM +0100, Andrey Konovalov wrote: > > 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); > > Ah, I see, that top 4 bits are zeroed by do_tag_check_fault(). When this > was added, the only tag faults were generated for user addresses. > > Anyway, I'd rather fix it in there based on bit 55, something like (only > compile-tested): > > diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c > index 3c40da479899..2b71079d2d32 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 the 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; > } BTW, we can do "untagged_addr(far) | (far & MTE_TAG_MASK)" here, as untagged_addr() doesn't change kernel pointers.