From patchwork Wed Oct 4 21:19:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985617 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 C593660586 for ; Wed, 4 Oct 2017 21:25:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B683A28B68 for ; Wed, 4 Oct 2017 21:25:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA20F28C2A; Wed, 4 Oct 2017 21:25:45 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id D601C28B68 for ; Wed, 4 Oct 2017 21:25:44 +0000 (UTC) Received: (qmail 16322 invoked by uid 550); 4 Oct 2017 21:21:43 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 16132 invoked from network); 4 Oct 2017 21:21:36 -0000 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=46B52AFPMSIdRCP95921HMb/ImgD/FvaG/AH6hTdj8E=; b=F4mbxkP9MMgkpxL2i0FNqYEmNPTmKzYhcNGtcGAXmR1skIESVLl36I6isr03lRSVQE pGkQinWYQL2Cjpqn/ZQKvfqMrAkhAbEas7kmtBh3lpSoR8x/Oiid/TnEdbTGRDxqU8rD j3FQcaNrSU82op5AL/aKPm0H0b5STdpggawuOGgRoh2aAev4OHIdce7q2ssUPtd7jUTs uNNEJL+CnNh8k0UgMu3UBVnipLsUnyyq8i1W89hkNwefQCA6koeBucBtLXsWOau8P4dz A1Y8vch8nbW9eiE0PAuuPaIjCzWueVJoxeChcv+/8vtOPlsRqiPppzyNvL/7aOYUV1VQ hQRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=46B52AFPMSIdRCP95921HMb/ImgD/FvaG/AH6hTdj8E=; b=QVqVk2Enp5jQACcG2XufGlZvi0k4OkYjoYmTcd2YLPLts/PUsNsFuC1+KzYNApGyIm ZCUGTzi7BncknmdQn4siIvkrICg/7uFz7vSQbzYSVZf0qSnAWeSGdc3QnjqCDezr5KhM JcVOHfq5Ckbvoxq2CI8ePozZpZlNwAKbeqXkD6lwi16B+uCacbAo97Er9/P0lOeyMuD5 hILfEbfy+oweJo8hnQAQp4Utg2e2ag8/qQuui9Qy8PT6UWqStL6MTIW75IEnHckk7NEO E71YmvJwz2ReOF+jLfzC1bTMrmMcxZZX0cXTe8xZk1gH+UE+4aXOndJ5BiEvj5+/To6Y 32yg== X-Gm-Message-State: AHPjjUhinq/q7Q0MyFz4r+h23RpW0JbMfZwE23eRoKLxiVASE/rSvFw8 oUxlupv1ZmMRJS1aALgfYvq3UA== X-Google-Smtp-Source: AOwi7QA7CRCA5V1U8bnt5IKCaaRLz1yhysYsGqW3BiVV7/DDzRON8hOT8DcujWhpBmjnb470x6QZYg== X-Received: by 10.159.204.138 with SMTP id t10mr20760372plo.450.1507152083977; Wed, 04 Oct 2017 14:21:23 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com Date: Wed, 4 Oct 2017 14:19:57 -0700 Message-Id: <20171004212003.28296-22-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Subject: [kernel-hardening] [RFC v3 21/27] x86/mm/dump_pagetables: Fix address markers index on x86_64 X-Virus-Scanned: ClamAV using ClamSMTP The address_markers_idx enum is not aligned with the table when EFI is enabled. Add an EFI_VA_END_NR entry in this case. Signed-off-by: Thomas Garnier --- arch/x86/mm/dump_pagetables.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 5e3ac6fe6c9e..8691a57da63e 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -52,12 +52,15 @@ enum address_markers_idx { LOW_KERNEL_NR, VMALLOC_START_NR, VMEMMAP_START_NR, -#ifdef CONFIG_KASAN +# ifdef CONFIG_KASAN KASAN_SHADOW_START_NR, KASAN_SHADOW_END_NR, -#endif +# endif # ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, +# endif +# ifdef CONFIG_EFI + EFI_VA_END_NR, # endif HIGH_KERNEL_NR, MODULES_VADDR_NR,