From patchwork Wed Oct 11 20:30:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000611 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 761B86037F for ; Wed, 11 Oct 2017 20:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A8C628B37 for ; Wed, 11 Oct 2017 20:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EA8B28B6B; Wed, 11 Oct 2017 20:35:58 +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 83C8128B66 for ; Wed, 11 Oct 2017 20:35:57 +0000 (UTC) Received: (qmail 15911 invoked by uid 550); 11 Oct 2017 20:31:57 -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 15704 invoked from network); 11 Oct 2017 20:31:50 -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=OZWjVg24wXxKBDNbQnAWt5HmoC3jzLYSZ4aDG0CXKys=; b=l9dbEKKKT/YFx47F4tNRuEWrtMXVBbEjsqRC/VcGlXGXoOyLdF918aaRW+9Mjujt9V Hwu+urCLPNq6rScEqipXOWQR9DcI+sXjX4l6l94nZLIAezxJHELDvLC0idtQZd65S/Pf r8/jLpdXK5wVXfIFY+RmvlCnbZOzIVazybzI4wQdbspnNZCMGRlp1dN51EsZ2fyoMU8/ IQLf87EcmLdZ46t1/7nPKI/JvQAzcg2UsRshbBGB/ntVWtDq3ncq38WJeyVxtT+85MQA KQOY1wo6pNVGO6NFV1iVaNMw1TwJyAevtgG/6OIkk1C5uIlBkcHT/1HU/ey9kMk36vV2 YqqQ== 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=OZWjVg24wXxKBDNbQnAWt5HmoC3jzLYSZ4aDG0CXKys=; b=SQePF66VVo2QI5COCDpD1yEZ007hnMWlyx1HiGEIsInVKP2TZlkf26npLuzcI38GxM QPOwAfXT6l/UA7xOFFjboK+dRr2MPQ0DlPVPalvMcLaTX+mDtYUBL5o/H6MtVs+sGmrI h3/k+yS1DB3R+ddFz10xK43WzP/ftzW/oJYiIak+szjNe2FZF53r81FUDj42DkyHfrCm uuPYi1zVKuoqbevnAaQdy0elBStSkNwEXv8xiEz6INFuFhVghfcG1tA8nKGu0C+/549E EyTepKQ15mHGXtMz5pWLh62OBWAAOgylmc4+sTgzz8Q2sGh4ghuMmb+9QwuDS7ChmmOr fjLg== X-Gm-Message-State: AMCzsaWH/UjMBHZ1nUGJjnmotBtOzLURWAD2Fi3mdoJRT1LbTBP1RbZs X/kr12KpPiivL8+eHKm4d57xlQ== X-Google-Smtp-Source: AOwi7QD5fGAi7gCaqCAw0YINWD1i2SyLe3y2uMhRny7cDvcPe+r0BweuMxbBaNy0tBNU6bFQi/QAqA== X-Received: by 10.98.35.212 with SMTP id q81mr163530pfj.273.1507753898005; Wed, 11 Oct 2017 13:31:38 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , 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, 11 Oct 2017 13:30:21 -0700 Message-Id: <20171011203027.11248-22-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-1-thgarnie@google.com> Subject: [kernel-hardening] [PATCH v1 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,