From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Date: Wed, 4 Oct 2017 14:19:57 -0700 Message-Id: <20171004212003.28296-22-thgarnie@google.com> 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 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 List-ID: 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, -- 2.14.2.920.gcf0c67979c-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 21/27] x86/mm/dump_pagetables: Fix address markers index on x86_64 Date: Wed, 4 Oct 2017 14:19:57 -0700 Message-ID: <20171004212003.28296-22-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" 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 Bor Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org List-Id: linux-arch.vger.kernel.org VGhlIGFkZHJlc3NfbWFya2Vyc19pZHggZW51bSBpcyBub3QgYWxpZ25lZCB3aXRoIHRoZSB0YWJs ZSB3aGVuIEVGSSBpcwplbmFibGVkLiBBZGQgYW4gRUZJX1ZBX0VORF9OUiBlbnRyeSBpbiB0aGlz IGNhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgR2FybmllciA8dGhnYXJuaWVAZ29vZ2xlLmNv bT4KLS0tCiBhcmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYyB8IDcgKysrKystLQogMSBmaWxl IGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9h cmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYyBiL2FyY2gveDg2L21tL2R1bXBfcGFnZXRhYmxl cy5jCmluZGV4IDVlM2FjNmZlNmM5ZS4uODY5MWE1N2RhNjNlIDEwMDY0NAotLS0gYS9hcmNoL3g4 Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYworKysgYi9hcmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMu YwpAQCAtNTIsMTIgKzUyLDE1IEBAIGVudW0gYWRkcmVzc19tYXJrZXJzX2lkeCB7CiAJTE9XX0tF Uk5FTF9OUiwKIAlWTUFMTE9DX1NUQVJUX05SLAogCVZNRU1NQVBfU1RBUlRfTlIsCi0jaWZkZWYg Q09ORklHX0tBU0FOCisjIGlmZGVmIENPTkZJR19LQVNBTgogCUtBU0FOX1NIQURPV19TVEFSVF9O UiwKIAlLQVNBTl9TSEFET1dfRU5EX05SLAotI2VuZGlmCisjIGVuZGlmCiAjIGlmZGVmIENPTkZJ R19YODZfRVNQRklYNjQKIAlFU1BGSVhfU1RBUlRfTlIsCisjIGVuZGlmCisjIGlmZGVmIENPTkZJ R19FRkkKKwlFRklfVkFfRU5EX05SLAogIyBlbmRpZgogCUhJR0hfS0VSTkVMX05SLAogCU1PRFVM RVNfVkFERFJfTlIsCi0tIAoyLjE0LjIuOTIwLmdjZjBjNjc5NzljLWdvb2cKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 21/27] x86/mm/dump_pagetables: Fix address markers index on x86_64 Date: Wed, 4 Oct 2017 14:19:57 -0700 Message-ID: <20171004212003.28296-22-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org 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 , Bor Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" List-Id: linux-crypto.vger.kernel.org VGhlIGFkZHJlc3NfbWFya2Vyc19pZHggZW51bSBpcyBub3QgYWxpZ25lZCB3aXRoIHRoZSB0YWJs ZSB3aGVuIEVGSSBpcwplbmFibGVkLiBBZGQgYW4gRUZJX1ZBX0VORF9OUiBlbnRyeSBpbiB0aGlz IGNhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgR2FybmllciA8dGhnYXJuaWVAZ29vZ2xlLmNv bT4KLS0tCiBhcmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYyB8IDcgKysrKystLQogMSBmaWxl IGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9h cmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYyBiL2FyY2gveDg2L21tL2R1bXBfcGFnZXRhYmxl cy5jCmluZGV4IDVlM2FjNmZlNmM5ZS4uODY5MWE1N2RhNjNlIDEwMDY0NAotLS0gYS9hcmNoL3g4 Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYworKysgYi9hcmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMu YwpAQCAtNTIsMTIgKzUyLDE1IEBAIGVudW0gYWRkcmVzc19tYXJrZXJzX2lkeCB7CiAJTE9XX0tF Uk5FTF9OUiwKIAlWTUFMTE9DX1NUQVJUX05SLAogCVZNRU1NQVBfU1RBUlRfTlIsCi0jaWZkZWYg Q09ORklHX0tBU0FOCisjIGlmZGVmIENPTkZJR19LQVNBTgogCUtBU0FOX1NIQURPV19TVEFSVF9O UiwKIAlLQVNBTl9TSEFET1dfRU5EX05SLAotI2VuZGlmCisjIGVuZGlmCiAjIGlmZGVmIENPTkZJ R19YODZfRVNQRklYNjQKIAlFU1BGSVhfU1RBUlRfTlIsCisjIGVuZGlmCisjIGlmZGVmIENPTkZJ R19FRkkKKwlFRklfVkFfRU5EX05SLAogIyBlbmRpZgogCUhJR0hfS0VSTkVMX05SLAogCU1PRFVM RVNfVkFERFJfTlIsCi0tIAoyLjE0LjIuOTIwLmdjZjBjNjc5NzljLWdvb2cKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK