projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 321d628a FG |
1 | From 22ad4e1d6ca8885ad2cca842838125de9130eb7a Mon Sep 17 00:00:00 2001 |
| 2 | From: Andy Whitcroft <apw@canonical.com> | |
| 3 | Date: Mon, 18 Dec 2017 12:09:25 +0000 | |
| 633c5ed1 | 4 | Subject: [PATCH 223/242] UBUNTU: [Config] updateconfigs to enable PTI |
| 321d628a FG |
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 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
| 12 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
| 13 | (cherry picked from commit 239497489e75fe18b55f568a43c76fd65a7cbf4f) | |
| 14 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 15 | --- | |
| 16 | debian.master/config/amd64/config.common.amd64 | 1 + | |
| 17 | debian.master/config/config.common.ubuntu | 5 ++++- | |
| 18 | debian.master/config/i386/config.common.i386 | 1 + | |
| 19 | 3 files changed, 6 insertions(+), 1 deletion(-) | |
| 20 | ||
| 21 | diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 | |
| 22 | index 6df8bcf72690..6412a1366160 100644 | |
| 23 | --- a/debian.master/config/amd64/config.common.amd64 | |
| 24 | +++ b/debian.master/config/amd64/config.common.amd64 | |
| 25 | @@ -471,6 +471,7 @@ CONFIG_UIO_PRUSS=m | |
| 26 | CONFIG_UIO_SERCOS3=m | |
| 27 | CONFIG_ULTRIX_PARTITION=y | |
| 28 | CONFIG_UNIXWARE_DISKLABEL=y | |
| 29 | +# CONFIG_UNWINDER_FRAME_POINTER is not set | |
| 30 | CONFIG_USB_DWC2_PCI=m | |
| 31 | CONFIG_USB_EHCI_HCD_PLATFORM=y | |
| 32 | CONFIG_USB_GADGET=m | |
| 33 | diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu | |
| 34 | index 37a14874f7f9..ebb00db16844 100644 | |
| 35 | --- a/debian.master/config/config.common.ubuntu | |
| 36 | +++ b/debian.master/config/config.common.ubuntu | |
| 37 | @@ -6201,6 +6201,7 @@ CONFIG_PADATA=y | |
| 38 | CONFIG_PAGE_COUNTER=y | |
| 39 | # CONFIG_PAGE_OWNER is not set | |
| 40 | # CONFIG_PAGE_POISONING is not set | |
| 41 | +CONFIG_PAGE_TABLE_ISOLATION=y | |
| 42 | CONFIG_PALMAS_GPADC=m | |
| 43 | CONFIG_PANASONIC_LAPTOP=m | |
| 44 | CONFIG_PANEL=m | |
| 45 | @@ -8659,7 +8660,7 @@ CONFIG_STACKTRACE=y | |
| 46 | CONFIG_STACKTRACE_SUPPORT=y | |
| 47 | CONFIG_STACK_GUARD=256 | |
| 48 | CONFIG_STACK_TRACER=y | |
| 49 | -# CONFIG_STACK_VALIDATION is not set | |
| 50 | +CONFIG_STACK_VALIDATION=y | |
| 51 | # CONFIG_STAGING_BOARD is not set | |
| 52 | CONFIG_STAGING_MEDIA=y | |
| 53 | # CONFIG_STATIC_KEYS_SELFTEST is not set | |
| 54 | @@ -9173,6 +9174,8 @@ CONFIG_UNIX=y | |
| 55 | CONFIG_UNIX98_PTYS=y | |
| 56 | CONFIG_UNIX_DIAG=m | |
| 57 | CONFIG_UNUSED_SYMBOLS=y | |
| 58 | +# CONFIG_UNWINDER_GUESS is not set | |
| 59 | +CONFIG_UNWINDER_ORC=y | |
| 60 | CONFIG_UPROBES=y | |
| 61 | CONFIG_UPROBE_EVENTS=y | |
| 62 | CONFIG_US5182D=m | |
| 63 | diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 | |
| 64 | index eb973e0eb199..4b8d6a14e31c 100644 | |
| 65 | --- a/debian.master/config/i386/config.common.i386 | |
| 66 | +++ b/debian.master/config/i386/config.common.i386 | |
| 67 | @@ -463,6 +463,7 @@ CONFIG_UIO_PRUSS=m | |
| 68 | CONFIG_UIO_SERCOS3=m | |
| 69 | CONFIG_ULTRIX_PARTITION=y | |
| 70 | CONFIG_UNIXWARE_DISKLABEL=y | |
| 71 | +CONFIG_UNWINDER_FRAME_POINTER=y | |
| 72 | CONFIG_USB_DWC2_PCI=m | |
| 73 | CONFIG_USB_EHCI_HCD_PLATFORM=y | |
| 74 | CONFIG_USB_GADGET=m | |
| 75 | -- | |
| 76 | 2.14.2 | |
| 77 |