diff mbox series

[Artful] Revert "UBUNTU: [Config] updateconfigs to enable PTI"

Message ID 1515433505-24410-2-git-send-email-kamal@canonical.com
State New
Headers show
Series [Artful] Revert "UBUNTU: [Config] updateconfigs to enable PTI" | expand

Commit Message

Kamal Mostafa Jan. 8, 2018, 5:45 p.m. UTC 
CVE-2017-5754

This reverts commit 239497489e75fe18b55f568a43c76fd65a7cbf4f.

Enabling CONFIG_UNWINDER_ORC disabled CONFIG_FRAME_POINTER, which is
undesirable.

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 -
 debian.master/config/config.common.ubuntu      | 5 +----
 debian.master/config/i386/config.common.i386   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6412a13..6df8bcf 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -471,7 +471,6 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ebb00db..37a1487 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6201,7 +6201,6 @@  CONFIG_PADATA=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
-CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
@@ -8660,7 +8659,7 @@  CONFIG_STACKTRACE=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STACK_GUARD=256
 CONFIG_STACK_TRACER=y
-CONFIG_STACK_VALIDATION=y
+# CONFIG_STACK_VALIDATION is not set
 # CONFIG_STAGING_BOARD is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -9174,8 +9173,6 @@  CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=m
 CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_UNWINDER_GUESS is not set
-CONFIG_UNWINDER_ORC=y
 CONFIG_UPROBES=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_US5182D=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4b8d6a1..eb973e0 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -463,7 +463,6 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m