From patchwork Fri May 25 14:40:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10427663 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 662CA60545 for ; Fri, 25 May 2018 14:41:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5550D297BB for ; Fri, 25 May 2018 14:41:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4940D297C5; Fri, 25 May 2018 14:41:10 +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 BABCB29780 for ; Fri, 25 May 2018 14:41:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9058C6B000E; Fri, 25 May 2018 10:40:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8B6FF6B0010; Fri, 25 May 2018 10:40:54 -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 77C886B0266; Fri, 25 May 2018 10:40:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id 18AC76B000E for ; Fri, 25 May 2018 10:40:54 -0400 (EDT) Received: by mail-wm0-f70.google.com with SMTP id a16-v6so3551020wmg.9 for ; Fri, 25 May 2018 07:40:54 -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=WiGkSNqGH903hIGA33vmVoOZOmt19a1C4YRXSx3lZzA=; b=LJS3q8rfoSs8qlqNwT8YHZhxNssihJkrN3I694wqoXVEKSV7g8PjlOzxa22wfAdMUF 9pttwiu6wYjH12H3oje5tCsnNm4po+6D6yJXCTQcOwDn96kKRCCYOdZ0pul136Bu8AWu LTNxiwbNwPfLI13f6IoIw8OWicB4wiqb7FCVaNRWO5hT0y8XboPOniqQJedlFc6nDzdl cyRzGEWZS76nxVOWrf4u8IFuR8PvkNhMFg33QyD1OPy4IhEY2QmcducU+Zk3hdi0449o V+37Pc39hrHze+4/rjA3/EDxIgokZpAy+v6K7PVCK294HtZ5isEwCJftZXNzEOBtDqAS eNsQ== X-Gm-Message-State: ALKqPwd7/8NF0DBHKUrjGShOv74tiIejcLXiY8//hnWlklPSGw+YW4pX N+8hvP6d6iNvE+k0m4uUNeVjN/bKeGh6Nlv8IVFD5HfO/Z4MGrT816vAF0dUnoEW0ttuYB2T9jj er/RY+XaQnun2BFqBDLBjoK4A4rU/464Q3yMgEo2WnP6fIH4i15dEgnIdd3U42OtfeHXy0/vy4N jGPJDLY6jHbwF4F10Tu1waC/uBdUpIIZ7wwA7j6b16lTdlrn259Of8/ceBgQUNcvvoTDJbqo5l6 YxyRHsxT/glOmlyK1BQRL42bnCoCLfc94qsfBMlW71XLeS68b86ShKqmvhAc5yY8OI+GlPGTJ6U S8Qxrxv/RCeL7nlHajjkV7AwyOGr/3ia3ogoQ6Ng8cnSkjiAKHqy+3FZ/QZdqXr26wnjYWRHqX/ 8 X-Received: by 2002:adf:bc8f:: with SMTP id g15-v6mr2448307wrh.266.1527259253645; Fri, 25 May 2018 07:40:53 -0700 (PDT) X-Received: by 2002:adf:bc8f:: with SMTP id g15-v6mr2448262wrh.266.1527259252821; Fri, 25 May 2018 07:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527259252; cv=none; d=google.com; s=arc-20160816; b=ERfAc4Yhs/xeu0f/Ouw1PCCmDCFw7YurFJff/5+4iiYwCiICkfc+guHyZvfFEhUmgh 8kUCQsQ+m0tX05AWJzUbnce+HGAPUGe1+FxDWl9zG1Pj0RRevIY3xZ1W1nM7/Y5ocRF/ BTAaqzZxUuaw8VgDwkt9OiUuhZFjJZISdvJVg6GGGDMi/T9oq6R6ImCq/G3SehfHKUUM 8s57bLj0VOZq7hKggh3vlNwTepBVc3p5kXecPdEZ46N0rcjiPLDBSe36TecQRkJ7YZ8A pJXmjMzCqSPUufG1jvgU5FEEhTqc1+4MW0aqic4TzH5QWokysyDhSLncUIhXuQ+zeAxO H9uQ== 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=WiGkSNqGH903hIGA33vmVoOZOmt19a1C4YRXSx3lZzA=; b=sLOooAPHOsrDm6QdBVWg7swzKOcWMqBctOyVZZFovp0N/g3GGLqOBbsV27xgfFo+qV dM4TjAlON5IF44xBrLp+SaCQoT5Ts3rlJgs1H0mRKmnZwOZEP+sLC7dE8IWNOJr3ZApV HWI6jYFYmRXXSuHB/LXHuyTCG2urQTzs4qqQvumrw+wuwxmrQKGXi3cNg5ao2RzjHtvV MWCL2U97DN+bmJ6mj2mrDZy+6Q+SPYhRi0u+r76UQb0CDdDSmyffga4KKlpcz2MObwkR /2WadyIJN0a4D6rfw2HeMAQN0/CmP9MhOnYfwZiGWIW99/1I1LoE4M0GWFqPirL8w4Ep Q4WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Hmc6GeY8; 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 l184-v6sor2467020wmg.30.2018.05.25.07.40.52 for (Google Transport Security); Fri, 25 May 2018 07:40:52 -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=Hmc6GeY8; 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=WiGkSNqGH903hIGA33vmVoOZOmt19a1C4YRXSx3lZzA=; b=Hmc6GeY8OwwW5GnyfHGQl6QdQ2KQ4taEWzq6cynCxQ5DoKOztyNF3wtoDNqyLeb9/Y tX1bodDXn8/redv4379i26eLyidfgA7CA0p8LHgH5gkAHc1hqqlu01aRc62rnMaQpihB T8Hyh6b0L8cFwn8QTOFldoJhjWNnSWygJO2USTjyrKgKlnxgOrQSfNlvb1zD15y+x2Q4 r/oFXpwL190tkz5B2nDlNibzDhEsFRAUPAmh1YEZ5uvkxdrsueJDKsUwtF4OL3PmT3Li vChjRnUcXIdeIuY5qKNkJVc0yMI+AwPPneSEG1YxC2SydxBi1qFeeLIdGXRPlr4PkfVH EaLg== X-Google-Smtp-Source: AB8JxZoJi60Vul5z++qnub7+diIzRstxFsU0qHnR4UmbVQU4sZeZyuIoDLrvAPCqI2oNJDxTP7XwIw== X-Received: by 2002:a1c:4ad9:: with SMTP id n86-v6mr2375548wmi.0.1527259251415; Fri, 25 May 2018 07:40:51 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id q2-v6sm25293885wrm.26.2018.05.25.07.40.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 May 2018 07:40:50 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , Andrey Konovalov , Mark Rutland , Nick Desaulniers , Yury Norov , Marc Zyngier , Kristina Martsenko , Suzuki K Poulose , Punit Agrawal , Dave Martin , Ard Biesheuvel , James Morse , Michael Weiser , Julien Thierry , Tyler Baicar , "Eric W . Biederman" , Thomas Gleixner , Ingo Molnar , Kees Cook , Sandipan Das , David Woodhouse , Paul Lawrence , Herbert Xu , Josh Poimboeuf , Geert Uytterhoeven , Tom Lendacky , Arnd Bergmann , Dan Williams , Michal Hocko , Jan Kara , Ross Zwisler , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Matthew Wilcox , "Kirill A . Shutemov" , Souptick Joarder , Hugh Dickins , Davidlohr Bueso , Greg Kroah-Hartman , Philippe Ombredanne , Kate Stewart , Laura Abbott , Boris Brezillon , Vlastimil Babka , Pintu Agarwal , Doug Berger , Anshuman Khandual , Mike Rapoport , Mel Gorman , Pavel Tatashin , Tetsuo Handa , 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 , Kees Cook , Jann Horn , Mark Brand , Chintan Pandya Subject: [PATCH v2 06/16] khwasan, arm64: untag virt address in __kimg_to_phys and _virt_addr_is_linear Date: Fri, 25 May 2018 16:40:22 +0200 Message-Id: <3d0a88c6c0cec0e1676b7ed1417c76bde81e7ad7.1527259068.git.andreyknvl@google.com> X-Mailer: git-send-email 2.17.0.921.gf22659ad46-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))