From patchwork Wed Jun 20 17:39:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10478231 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 91E83601D7 for ; Wed, 20 Jun 2018 17:40:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E50728D69 for ; Wed, 20 Jun 2018 17:40:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7280C28D9A; Wed, 20 Jun 2018 17:40:29 +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 0830B28D69 for ; Wed, 20 Jun 2018 17:40:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26AD06B026A; Wed, 20 Jun 2018 13:40:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1CD166B026B; Wed, 20 Jun 2018 13:40:19 -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 093126B026C; Wed, 20 Jun 2018 13:40:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 984A26B026A for ; Wed, 20 Jun 2018 13:40:18 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id t14-v6so238559wrr.23 for ; Wed, 20 Jun 2018 10:40:18 -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=3JRyQhTdC+u2oogyIrlq2ZoH/8cj6t0szX7aMWVFrqI=; b=ZA4TXf/uNm09Ijfg7+q4qhgfC16qZCLH0Qa7wA6Y49u3sW5g7XrIk+KhofyI+3UHn0 fcv2BVP31kF+INI/ilYrjFwx1u8fh97RBYdp19TA1nbCfnoFcjfVJpsHEy1NEdLvsdAe jQnAtrzEVfQm8yvcRpvTm7JA8GBK/RlJOcyWkQL4LyidzZK9qpUIQVT1otHzOG9WDZ0h 7hRbziu2vIb5dp5aL6TtVjbEwoZbQYeN3CHLP/pw/prIMJj4P1SKBDvzPfhVoh+7BM6/ oBu7YH4M9RZkhAHDZOcK1yaOkIz1D/JCC2uo37GJ5GKl9NZMvBRuHPz2hWoWoPkQjpuq 7QMg== X-Gm-Message-State: APt69E0P2x89DjvOtQz1K8gCsBJk7MOV7y972enwY//y7XrfjV0lyYB7 Ky9Ongo1xrJfdPyv9+/fP1eHsXUd9I7b2pfR7pYsUItpCDMnpm4e+uj9D/0FF2EIIy2zJdh0AUY ETHbOgR87gFe7DSjX2ziw19kCIG6N5PAfZaZ7r+xUlFRKwwkyxJ+NwhDlzJoTwbLyIkAL8FF7cy D9JCR8zOFYtnGH7Cg51ASVoelND2c6hq/NV1aCTNrTmI7MKLKr7i+O+54qQwypVJ4GEBXO+mxLm fIDF+cGld3ZpN1yI5c4ynHgUIiM9jQD0zOayrK92QKUEcvtGhX+7DAtRcJ/X2b0xhEYpJftRIIb eQbxRTFwJIigLXHoLpkt240R+M+5xVP8SVi0A4wh+kdF8KdsLvO2GMmjt5rfwAuFTBBpw8Y56js B X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr2322088wmb.147.1529516418149; Wed, 20 Jun 2018 10:40:18 -0700 (PDT) X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr2322054wmb.147.1529516417378; Wed, 20 Jun 2018 10:40:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529516417; cv=none; d=google.com; s=arc-20160816; b=0xhspkXFh8L8g+Et34koq/YjLgLecbUl8sjE6o/OsBUssG+Su2Mh1HNO5ncWmfh2oh pn41/vt9pokYOVg5jGALJCAEtf/SFkwaY1IS0FdKSBQkuiNGfOIp1IhbR4W7OEH/O2G/ mku1vK6+eySDWIvosoasAxB05wrAbdVauvs3SlEo5Ri9nRIty7gPvX6+3d0ILG0Ps3LV lNr82k5dStcW66lm7Y4026qmT4EF86TxMqJgaU2OjydCDKWUDB2mnskhsPZ+MYGjdAgG XNJzrsd/uiIdj1onfhmAae3QPgRUDs21o/ns9c5WEgtZnd1PdB0rex3XDV5wT9R+0uKe 5Pkw== 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=3JRyQhTdC+u2oogyIrlq2ZoH/8cj6t0szX7aMWVFrqI=; b=RuQgvP4HwHUiDJtu/wmF0uaARrDZaA04BHv0+L/7QMZSIh/3cc+L2c4JGNYw4yfE/p G7q4+PSUFeR1aEp06oXs5dNlpkJ1N547VzTiuj/rRL1y/bNWWqNtHGTyjUGBmUGtm8D4 84eqgME1sKuKy+ssjnUdqktrUdjEhxCmqo7UX7SKfZcJlLqx2YHt893hVoc0c2+078Ei 6/mHngCL1pmbQPWMJv73xRXXVi+Y6uz5mIesVC24nmrKF3NqE4jbou6W9AHTjfMFMgcr 6kWawVrDNDoCZ/alb0E1zEwfBfHG6nK4wGsA5hzXQLIBk8DbW1S/MCyrkErk2nk7akOX c9sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ul87aooq; 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 m69-v6sor1068977wma.70.2018.06.20.10.40.17 for (Google Transport Security); Wed, 20 Jun 2018 10:40:17 -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=ul87aooq; 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=3JRyQhTdC+u2oogyIrlq2ZoH/8cj6t0szX7aMWVFrqI=; b=ul87aooq1BZG/ua2mVfhzy4uN/qXMn1UhnfPhLPsnejOFWAGkdptsDs3M1oTmI1nAl C21Guh3/JlIPOD09uCLOi/BPVDdoVIByJeGnb5+0zYUBeO6K0u2ykMy0COZIgmOz1RLu Zxb22xpZgwMuVJmAHzA/tiOzc8lJ9vj2KFxeTCFLKLfgUpo+M+Tm1wglu7mRA2K0TqbF hvnFePrjRgmAQEcYRrMUgCtAycpp9xYn8sBFpPHZv1KPp5HCnPdX3LCPU/yxR8qpU4IX TouAVK6EgxY9z8IBnh4SoOd7uxcao0fDK+ctG8NFDPZ/DgOTBe6PYuJ0kohJsQdfPC9g TxrA== X-Google-Smtp-Source: ADUXVKIVlEK10pHjqrgIg6B9IiEh/Scv3BRLQ1sYbPsfzIp6woFogpBtw12wTtllSZMEyn06q6NkAA== X-Received: by 2002:a1c:4787:: with SMTP id m7-v6mr2601468wmi.92.1529516416725; Wed, 20 Jun 2018 10:40:16 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id f18-v6sm4388598wro.1.2018.06.20.10.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:40:15 -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 v3 06/17] khwasan, arm64: untag virt address in __kimg_to_phys and _virt_addr_is_linear Date: Wed, 20 Jun 2018 19:39:52 +0200 Message-Id: <44b51b47d2d0517332f37c39cb7ea0016dcf032e.1529515183.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-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))