[Trusty][PATCH 3/4] UBUNTU: [Config] updateconfigs: select CC_STACKPROTECTOR_REGULAR
Kamal Mostafa
kamal at canonical.com
Fri Dec 11 19:53:25 UTC 2015
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 1 +
debian.master/config/annotations | 4 ++--
debian.master/config/arm64/config.common.arm64 | 1 +
debian.master/config/armhf/config.common.armhf | 1 +
debian.master/config/config.common.ubuntu | 5 ++++-
debian.master/config/enforce | 2 +-
debian.master/config/i386/config.common.i386 | 1 +
debian.master/config/powerpc/config.common.powerpc | 1 +
debian.master/config/ppc64el/config.common.ppc64el | 1 +
9 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 03b8aa1..4204ad9 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -19,6 +19,7 @@ CONFIG_ATA_PIIX=y
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_AUDIT_ARCH=y
CONFIG_BCH=m
+CONFIG_CC_STACKPROTECTOR=y
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMPACTION=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 544b489..d4744fd 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1616,7 +1616,7 @@ CONFIG_KSM y
CONFIG_TRANSPARENT_HUGEPAGE y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS y
-CONFIG_CC_STACKPROTECTOR y mark<Security>
+CONFIG_CC_STACKPROTECTOR_REGULAR y mark<Security>
# Menu: Kernel hacking
CONFIG_MAGIC_SYSRQ y
@@ -1949,7 +1949,7 @@ CONFIG_SMP y
# Menu: Processor type and features
# Menu: Processor type and features (x86)
-CONFIG_CC_STACKPROTECTOR y mark<Security>
+CONFIG_CC_STACKPROTECTOR_REGULAR y mark<Security>
CONFIG_KEXEC y
CONFIG_CRASH_DUMP y
CONFIG_RELOCATABLE y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5408b0f..82c6c90 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -13,6 +13,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ATA_PIIX=m
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_BCH=m
+# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_CMDLINE="console=ttyAMA0"
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMPACTION=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 372589d..027bc81 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -12,6 +12,7 @@ CONFIG_ATA_PIIX=y
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_BATTERY_TWL4030_MADC=m
CONFIG_BCH=y
+CONFIG_CC_STACKPROTECTOR=y
CONFIG_CMDLINE=""
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 5d777b0..523c76c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -936,7 +936,9 @@ CONFIG_CB710_CORE=m
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -2393,6 +2395,7 @@ CONFIG_HAVE_ARM_SCU=y
CONFIG_HAVE_ARM_TWD=y
CONFIG_HAVE_ATOMIC_IOMAP=y
CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 4e5f90f..31ced8f 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -17,7 +17,7 @@ value CONFIG_DEBUG_INFO y
!exists CONFIG_XEN_ACPI_PROCESSOR | value CONFIG_XEN_ACPI_PROCESSOR y
!exists CONFIG_SECCOMP | value CONFIG_SECCOMP y
!exists CONFIG_HAVE_ARCH_SECCOMP_FILTER | value CONFIG_SECCOMP_FILTER y
-!exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y
+!exists CONFIG_CC_STACKPROTECTOR_REGULAR | value CONFIG_CC_STACKPROTECTOR_REGULAR y
!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y
!exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y
!exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 10ad22c..e42c57c 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -18,6 +18,7 @@ CONFIG_ATA_PIIX=y
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_BCH=m
+CONFIG_CC_STACKPROTECTOR=y
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMPACTION=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a487f24..67d7e73 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -15,6 +15,7 @@ CONFIG_ATA_PIIX=m
CONFIG_AUDIT_ARCH=y
# CONFIG_BATTERY_TWL4030_MADC is not set
CONFIG_BCH=m
+# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_CODE_PATCHING_SELFTEST is not set
# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMPACTION=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 5183bc5..f0e7fa5 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -16,6 +16,7 @@ CONFIG_ATA_PIIX=m
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_AUDIT_ARCH=y
CONFIG_BCH=m
+# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_CODE_PATCHING_SELFTEST=y
CONFIG_COMPACTION=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
--
1.9.1
More information about the kernel-team
mailing list