UBUNTU: [Config] enable CONFIG_CC_STACKPROTECTOR_STRONG=y

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index c773aa3d8a1ef08de68b938b18fc02dc81881975..761df6146df3ed2a7b547ddcd43d760adf358def 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2892,7 +2892,7 @@ CONFIG_TREE_RCU                                 p policy<{'amd64-generic': 'y',
 CONFIG_PREEMPT_RCU                              p policy<{'amd64-lowlatency': 'y', 'i386-lowlatency': 'y'}>
 
 # Menu: General setup >> Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR               p mark<ENFORCED> policy<{'powerpc': '-', 'ppc64el': '-', '*': 'y'}>
+CONFIG_CC_STACKPROTECTOR_STRONG                        p mark<ENFORCED> policy<{'powerpc': '-', 'ppc64el': '-', '*': 'y'}>
 
 # Menu: General setup >> Stack Protector buffer overflow detection >> Architecture: arm
 

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 132939e5915fc697aa99b1228e3857a77fc9609c..3b227c809dc55af786210f943e6598fd32d171d3 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1094,8 +1094,8 @@ CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 CONFIG_CC10001_ADC=m
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set