]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0109-x86-mm-Define-_PAGE_TABLE-using-_KERNPG_TABLE.patch
add objtool build fix
[pve-kernel.git] / patches / kernel / 0109-x86-mm-Define-_PAGE_TABLE-using-_KERNPG_TABLE.patch
1 From 19a0f9475a62580729769eb430d5dd38026f0f02 Mon Sep 17 00:00:00 2001
2 From: Borislav Petkov <bp@suse.de>
3 Date: Fri, 3 Nov 2017 11:20:28 +0100
4 Subject: [PATCH 109/233] x86/mm: Define _PAGE_TABLE using _KERNPG_TABLE
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 CVE-2017-5754
10
11 ... so that the difference is obvious.
12
13 No functionality change.
14
15 Signed-off-by: Borislav Petkov <bp@suse.de>
16 Cc: Linus Torvalds <torvalds@linux-foundation.org>
17 Cc: Peter Zijlstra <peterz@infradead.org>
18 Cc: Thomas Gleixner <tglx@linutronix.de>
19 Link: http://lkml.kernel.org/r/20171103102028.20284-1-bp@alien8.de
20 Signed-off-by: Ingo Molnar <mingo@kernel.org>
21 (backported from commit c7da092a1f243bfd1bfb4124f538e69e941882da)
22 Signed-off-by: Andy Whitcroft <apw@canonical.com>
23 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
24 (cherry picked from commit 8c69b0c03cd24576ac69c36ede00afae76bab464)
25 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
26 ---
27 arch/x86/include/asm/pgtable_types.h | 3 +--
28 1 file changed, 1 insertion(+), 2 deletions(-)
29
30 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
31 index bf9638e1ee42..01f6dc938ccb 100644
32 --- a/arch/x86/include/asm/pgtable_types.h
33 +++ b/arch/x86/include/asm/pgtable_types.h
34 @@ -121,10 +121,9 @@
35
36 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
37
38 -#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | \
39 - _PAGE_ACCESSED | _PAGE_DIRTY)
40 #define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | \
41 _PAGE_DIRTY)
42 +#define _PAGE_TABLE (_KERNPG_TABLE | _PAGE_USER)
43
44 /*
45 * Set of bits not changed in pte_modify. The pte's
46 --
47 2.14.2
48