From patchwork Tue Jun 26 13:15:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10488903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1ECF60386 for ; Tue, 26 Jun 2018 13:16:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D20052893B for ; Tue, 26 Jun 2018 13:16:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C660D28949; Tue, 26 Jun 2018 13:16:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F3F2893B for ; Tue, 26 Jun 2018 13:15:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 507E66B026D; Tue, 26 Jun 2018 09:15:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4DF596B026E; Tue, 26 Jun 2018 09:15:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CD6D6B026F; Tue, 26 Jun 2018 09:15:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id D5C8A6B026D for ; Tue, 26 Jun 2018 09:15:45 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id t139-v6so816254wmt.6 for ; Tue, 26 Jun 2018 06:15:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=lwHXL9yxDliTZ8j2rjrSn8b8qpXunOQohZ4LL0WT38k=; b=kFvgiPCRZKsuRRspihkewu/GL/QsW5YNx7jklXmRv4ZXnNd5nWoS71IxILzsV2yqvZ yiUmcwXIZ2vs+Uai2t43X6g80E319Yn5lw9CbbCZbIYp5D6zDnz2jNGCSUOISN/lApr9 aOYufk6xr6WZDy7UTY3/sYYC/ETZBBY1NwIvDq3u+UrSQWliHTTm7f+KcV2WJf+SzxXz ZHB9zg26ZrBbcgY3dy8yPOkTfKQ418e9DXiP15iUSnktN3eTvBRgM1+guRwx0RgNyHkL xAlvIijxeyoiDUUErlQ2CIAXwEBZktybY76xvQbPRiXLeDIGl9qDr0qFdsr0h5FJfwl3 kuJA== X-Gm-Message-State: APt69E0vd8MgdTI12fNDs4H39F0+FCR1Rh9qza6lzJudhigoAgwU7D5O 82SYyg4CS3dqy6jLzoxLSQQ9L4Ymgp67qKXZlsymViYmLg1ZfZvxHucR1G8ZJkjCKhm40tsW4rd qBp5OYgTiHUmAOW2ty9wXelt6TVZJBr7l4emOKvcsXG+k+VHDyJaj6shcXjdew7vBosb7qSJFvB 3M3wWvgoka4YGw19Up0xQ2FGC5XT6sYGRQiycWUC+nvcF8lYzHOroyT8XrX2dkltSnHSqWmDb5V zMdnNtJQ2jocJcEkWfdJg6aT9XqlyKz5tu0meSVffoE+lrLVBxw2mwxmTettrySrHaORVLsTDwg xhBh7TFWaZ58rIEmQM6w5/finmOLRiIOXZpJvN1wDWe43Ho1KN9nc82V9AYGJCPTDA22vRfY5AL c X-Received: by 2002:a5d:4049:: with SMTP id w9-v6mr1522872wrp.96.1530018945423; Tue, 26 Jun 2018 06:15:45 -0700 (PDT) X-Received: by 2002:a5d:4049:: with SMTP id w9-v6mr1522820wrp.96.1530018944590; Tue, 26 Jun 2018 06:15:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530018944; cv=none; d=google.com; s=arc-20160816; b=ZaLi2StIsUxoHKznYkzDUbSk4EISesEf/1AebE1qBkBcODUmXSFrH92gQhx6O5Upjq 3gOz/t+OKKTuAyZix23aFeKVWvzxn7TX28Wx4NYqCSIcHB+v9CV6LIF43YE2eOum87uN VEVpkqYBsgtVH7K02+uKt+NIUPVfNFdVaVQNEa6Z6B8gaWDVDRAdGifX0qN5b0b9/0sO 1UIjFDx0LabI8o6FBBnZ1RAR++t9NX2uh7axLf4RPrEPJZp/DQZgnbj/0k6fs9XZt3ga IQcz7rhT2HdMLFhTPCo4uvemX8EXkRlCDoShRPeoDPWYA5xsiO0pnIIQpAPKvJsNqCda Nxiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=lwHXL9yxDliTZ8j2rjrSn8b8qpXunOQohZ4LL0WT38k=; b=x4d9fW4iCza5zT7ZBjocZj7lOxvG6n22MC2p9Z5BClTqiMfKRerSVfzPAyZluXotfN McSX5L5VA+KMSRJPwvfYtc0HK6QxG/Vu47ZI3/qeBfI6s1lhmIqIkNMc0hlCmFT/2qnh 3iM2cVMwM7SKdzUlP2Es9eFNYi0TE0ilUEacsiLZxr4WN2oIcAycvHSVEbNAo/qJZzl9 r09Vop6j9AasXbpy19YRNxYz0LvKxXEdjdIGVv0ssF5X4qhsaD0GWgfuhxTeT7Yu1hPb 8XTlbyy0RDpI8OoniEeu0yHTvivtisLFxNkQGvaM+vghYXIxs+UwYrt72zLMCjmzFjtg ZwKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="Nve+YD/7"; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k71-v6sor579819wmc.87.2018.06.26.06.15.44 for (Google Transport Security); Tue, 26 Jun 2018 06:15:44 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="Nve+YD/7"; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lwHXL9yxDliTZ8j2rjrSn8b8qpXunOQohZ4LL0WT38k=; b=Nve+YD/7m5Js0YQS/esJN8P01yI1dAMjGhoRGaAHutX94HfutQ0RgEce4umiFTfdE3 omPIGdAEt+/+V8dRhsA8P2eBW5CfM24mjVK2LS/XGe9LcM1NEYFWucEWedQmNC2ouiIp OAJzl3Y5hmHZg6/OhXBD6a83XawAUnqYkEP2ZLsS9LMoFhyhSLmjQR3lmQtmlVeBqQUK n1GqZ5TgKx4Fv1x5KkTQ/cMCKnPIUZMMDBJgW710qluD3iaJGB7BhhD6f5cXXC40w+ss hUch11syrQUh8gkbm56tC3MoFSkc1B/xIwMc1InX0tmxhor0Y59VrOWsaP587UVx5D/Y Ui6g== X-Google-Smtp-Source: AAOMgpc3ljCQJRHXmxShHNHjl+H2ddHM0ibRaOTiGaw7lWPk/LXHQOWxlEdaNCrvLh4lWWyfMD6HVg== X-Received: by 2002:a1c:6c09:: with SMTP id h9-v6mr1689664wmc.138.1530018943832; Tue, 26 Jun 2018 06:15:43 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id w15-v6sm2162639wrn.25.2018.06.26.06.15.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:42 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Andrey Konovalov Subject: [PATCH v4 06/17] khwasan, arm64: untag virt address in __kimg_to_phys and _virt_addr_is_linear Date: Tue, 26 Jun 2018 15:15:16 +0200 Message-Id: <643759831c3d951a572a14a374bd50b8d394f821.1530018818.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: 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: X-Virus-Scanned: ClamAV using ClamSMTP __kimg_to_phys (which is used by virt_to_phys) and _virt_addr_is_linear (which is used by virt_addr_valid) assume that the top byte of the address is 0xff, which isn't always the case with KHWASAN enabled. The solution is to reset the tag in those macros. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/memory.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 6d084431b7f7..e9e054dfb1fc 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -92,6 +92,13 @@ #define KASAN_THREAD_SHIFT 0 #endif +#ifdef CONFIG_KASAN_HW +#define KASAN_TAG_SHIFTED(tag) ((unsigned long)(tag) << 56) +#define KASAN_SET_TAG(addr, tag) (((addr) & ~KASAN_TAG_SHIFTED(0xff)) | \ + KASAN_TAG_SHIFTED(tag)) +#define KASAN_RESET_TAG(addr) KASAN_SET_TAG(addr, 0xff) +#endif + #define MIN_THREAD_SHIFT (14 + KASAN_THREAD_SHIFT) /* @@ -225,7 +232,12 @@ static inline unsigned long kaslr_offset(void) #define __is_lm_address(addr) (!!((addr) & BIT(VA_BITS - 1))) #define __lm_to_phys(addr) (((addr) & ~PAGE_OFFSET) + PHYS_OFFSET) + +#ifdef CONFIG_KASAN_HW +#define __kimg_to_phys(addr) (KASAN_RESET_TAG(addr) - kimage_voffset) +#else #define __kimg_to_phys(addr) ((addr) - kimage_voffset) +#endif #define __virt_to_phys_nodebug(x) ({ \ phys_addr_t __x = (phys_addr_t)(x); \ @@ -301,7 +313,13 @@ static inline void *phys_to_virt(phys_addr_t x) #endif #endif +#ifdef CONFIG_KASAN_HW +#define _virt_addr_is_linear(kaddr) (KASAN_RESET_TAG((u64)(kaddr)) >= \ + PAGE_OFFSET) +#else #define _virt_addr_is_linear(kaddr) (((u64)(kaddr)) >= PAGE_OFFSET) +#endif + #define virt_addr_valid(kaddr) (_virt_addr_is_linear(kaddr) && \ _virt_addr_valid(kaddr))