From 0b111980fe515c5ab24bf21aca5aebd24c70f605 Mon Sep 17 00:00:00 2001 From: Stefan Bader 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 Signed-off-by: Tim Gardner --- 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 + debian.master/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(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 621fb1f..72aabe1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -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 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index d9f46b4..19b9b32 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -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" diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bdc3c79..e1e4b2e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1025,7 +1025,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 diff --git a/debian.master/config/enforce b/debian.master/config/enforce index 19316ea..bd98fd9 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -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. diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic index 05cb6a7..0bcfbe8 100644 --- a/debian.master/config/i386/config.flavour.generic +++ b/debian.master/config/i386/config.flavour.generic @@ -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 diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae index 6e71155..3fd857d 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -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 diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual index 4f1e434..4870cbb 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -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 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 4f5660e..14ad91a 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -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.10.4