From a8038024b3d3bebe57eb9f27f651651838aadaf0 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Tue, 11 Jan 2011 23:29:25 +0000
Subject: [PATCH] UBUNTU: Temporarily disable RODATA for virtual i386
Setting to RO was ok, but the whole patchset seems to cause
i386 EC instances to panic on boot when setting the kernel data
to read-only and no-execute. So while there is no proper fix
found disable this in the i386 virtual flavour.
BugLink: http://bugs.launchpad.net/bugs/699828
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 1 +
debian.master/config/armel/config.common.armel | 1 +
debian.master/config/config.common.ubuntu | 1 -
debian.master/config/enforce | 3 ++-
debian.master/config/i386/config.flavour.generic | 1 +
.../config/i386/config.flavour.generic-pae | 1 +
debian.master/config/i386/config.flavour.virtual | 1 +
debian.master/config/powerpc/config.common.powerpc | 1 +
8 files changed, 8 insertions(+), 2 deletions(-)
@@ -61,6 +61,7 @@ CONFIG_CRYPTO_SEQIV=m
CONFIG_DAB=y
CONFIG_DAVICOM_PHY=y
CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_RODATA=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DISPLAY_SUPPORT=m
# CONFIG_DL2K is not set
@@ -40,6 +40,7 @@ CONFIG_CRYPTO_SEQIV=m
CONFIG_DAB=y
CONFIG_DAVICOM_PHY=y
CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_RODATA=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
@@ -1026,7 +1026,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
CONFIG_DEBUG_SET_MODULE_RONX=y
@@ -15,7 +15,8 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y
# For architectures which support this option ensure it is enabled.
!exists CONFIG_SECCOMP | value CONFIG_SECCOMP y
!exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y
-!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y
+!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y | \
+ (flavour virtual & arch i386 & value CONFIG_DEBUG_RODATA n)
!exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y
!exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y
# For architectures which support this option ensure it is disabled.
@@ -3,6 +3,7 @@
#
# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_DEBUG_RODATA=y
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_INTEL_IDLE=y
@@ -3,6 +3,7 @@
#
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_DEBUG_RODATA=y
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_INTEL_IDLE=y
@@ -3,6 +3,7 @@
#
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_DEBUG_RODATA is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
# CONFIG_INTEL_IDLE is not set
@@ -52,6 +52,7 @@ CONFIG_CRYPTO_HMAC=y
# CONFIG_DAB is not set
CONFIG_DAVICOM_PHY=m
# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_RODATA=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
--
1.7.0.4