From c028c2f93b823795db58699c21295fb59c171947 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: May 16 2016 16:44:06 +0000 Subject: Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) --- diff --git a/Makefile b/Makefile index 4f11a03..128b2ff 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ debug: @perl -pi -e 's/# CONFIG_PROVE_RCU is not set/CONFIG_PROVE_RCU=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_VM_PGFLAGS is not set/CONFIG_DEBUG_VM_PGFLAGS=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug diff --git a/Makefile.release b/Makefile.release index fcd9081..da1a2fb 100644 --- a/Makefile.release +++ b/Makefile.release @@ -17,6 +17,7 @@ config-release: @perl -pi -e 's/CONFIG_PROVE_RCU=y/# CONFIG_PROVE_RCU is not set/' config-nodebug @perl -pi -e 's/CONFIG_DEBUG_SPINLOCK=y/# CONFIG_DEBUG_SPINLOCK is not set/' config-nodebug @perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_VM_PGFLAGS=y/# CONFIG_DEBUG_VM_PGFLAGS is not set/' config-nodebug @perl -pi -e 's/CONFIG_FAULT_INJECTION=y/# CONFIG_FAULT_INJECTION is not set/' config-nodebug @perl -pi -e 's/CONFIG_FAILSLAB=y/# CONFIG_FAILSLAB is not set/' config-nodebug @perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug diff --git a/config-debug b/config-debug index fc6505b..c0b2268 100644 --- a/config-debug +++ b/config-debug @@ -128,3 +128,5 @@ CONFIG_EDAC_DEBUG=y CONFIG_SPI_DEBUG=y CONFIG_X86_DEBUG_STATIC_CPU_HAS=y + +CONFIG_DEBUG_VM_PGFLAGS=y diff --git a/config-generic b/config-generic index ccc53d8..a62e247 100644 --- a/config-generic +++ b/config-generic @@ -4822,7 +4822,6 @@ CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_DEBUG_VM=y # CONFIG_DEBUG_VM_VMACACHE is not set # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible -CONFIG_DEBUG_VM_PGFLAGS=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_LOCKUP_DETECTOR=y # CONFIG_DEBUG_INFO_REDUCED is not set diff --git a/config-nodebug b/config-nodebug index c173637..c070f68 100644 --- a/config-nodebug +++ b/config-nodebug @@ -128,3 +128,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_SPI_DEBUG is not set # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set + +# CONFIG_DEBUG_VM_PGFLAGS is not set diff --git a/kernel.spec b/kernel.spec index 42027f3..0fb7bdf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2190,6 +2190,9 @@ fi # # %changelog +* Mon May 16 2016 Justin M. Forbes +- Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) + * Mon May 16 2016 Josh Boyer - CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410)