From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1521828371; cv=none; d=google.com; s=arc-20160816; b=Sjf7r4c0/NRWH8OFuPkGoLhVpQncGlKWqKOSOFFGurIrXtq4kN+OYs32iTDNY+2InS SHib5OAlmYRJrT72afb4oU/7VArff1IJ8X23H8eycZak8ppUeTp2tJTFjNVte1/onuOL rhD45hxCRktDRMn0wUx7Ylu57T7V7Xna/0hD7hf3HPLmn0ja/3KVPi9nyo/mfOTnwnG8 2Sz0yOe7WcN7HBuaN5BVNh+8BLmBKmFzaHBsVyGoZo9qo7vfn9RZeY6fD8+tyJrm43dV VkWzj6Iokbcd3UCyLiMh7Jn+ZwGGeYDfoW5wSzxHnE1Kapx+OT7AuHAJtD5nHQImakI3 zMlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=ZqyK3M6d8G1iLL6ihHv3V278/cE4UIR/+6hH/+0b1fg=; b=leh0VnM0Y5avc4synEhYnBgmyf1WU9/JzImfxsl7vp9OCqGR6StPBAZkIuES2nJan9 5aTU7mVRxM/I6x+Oo/5Ge3jiPHhhDzqTUSCGsM5f6gpS9UWEYzmlVtA8y/51Oc104BCa GvOIiqHAD/u0uqrxKYQNkWPv/y6s7CMNjhewmVbIBtIMC8luYaTC+7F50U68Fg534bZq W38cwSUjzs0PTIwG7IPAVPZKX0QsophyTZeZpRkdRno4oBLdClk8gLD42zcAK5oY0KDL O6N4Syu2FbpvJ1vzcByCMb9mgcJnwSE9yMOsmdiEB6a5NScs8wE307S40EL4aYe+2yz3 M5Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=QlYD5Z/V; 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 Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=QlYD5Z/V; 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 X-Google-Smtp-Source: AG47ELs1rhttWLCIc7fmS8q6Ex/DFVcWm+Gi+20xcvm4ssmpCRg+CUseKNlzfi9iZYM/bjtY1lK2Cw== From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Christoffer Dall , Marc Zyngier , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , "GitAuthor : Andrey Konovalov" , Mark Rutland , Ard Biesheuvel , Yury Norov , Nick Desaulniers , Suzuki K Poulose , Kristina Martsenko , Punit Agrawal , Dave Martin , Michael Weiser , James Morse , Julien Thierry , Steve Capper , Tyler Baicar , "Eric W . Biederman" , Stephen Boyd , Thomas Gleixner , Ingo Molnar , Paul Lawrence , Greg Kroah-Hartman , David Woodhouse , Sandipan Das , Kees Cook , Herbert Xu , Geert Uytterhoeven , Josh Poimboeuf , Arnd Bergmann , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, 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 , Kees Cook , Jann Horn , Mark Brand Subject: [RFC PATCH v2 06/15] khwasan, arm64: untag virt address in __kimg_to_phys Date: Fri, 23 Mar 2018 19:05:42 +0100 Message-Id: <81963b1be20e0d661aa626d18d245be653bdc150.1521828274.git.andreyknvl@google.com> X-Mailer: git-send-email 2.17.0.rc0.231.g781580f067-goog In-Reply-To: References: In-Reply-To: References: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595752706157567518?= X-GMAIL-MSGID: =?utf-8?q?1595752706157567518?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: __kimg_to_phys (which is used by virt_to_phys) assumes 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 __kimg_to_phys. __lm_to_phys doesn't require any fixups, as it zeroes out the top byte with the current implementation. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/memory.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index febd54ff3354..c13b89257352 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -98,6 +98,10 @@ #define KASAN_THREAD_SHIFT 0 #endif +#ifdef CONFIG_KASAN_TAGS +#define KASAN_PTR_TAG_MASK (UL(0xff) << 56) +#endif + #define MIN_THREAD_SHIFT (14 + KASAN_THREAD_SHIFT) /* @@ -231,7 +235,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_TAGS +#define __kimg_to_phys(addr) (((addr) | KASAN_PTR_TAG_MASK) - 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); \ -- 2.17.0.rc0.231.g781580f067-goog