diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-05-16 11:43:04 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-05-16 11:43:04 -0500 |
| commit | 9b3b59db20e9c1f9585edf2c435cafd06ad8e6c8 (patch) | |
| tree | f87372b64dfbf898efa8318c9a541d1df9303852 | |
| parent | 6c1de60a560a0f0b51e027541afd5ef12e6d392d (diff) | |
| download | kernel-9b3b59db20e9c1f9585edf2c435cafd06ad8e6c8.tar.gz kernel-9b3b59db20e9c1f9585edf2c435cafd06ad8e6c8.tar.xz kernel-9b3b59db20e9c1f9585edf2c435cafd06ad8e6c8.zip | |
Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173)
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Makefile.release | 1 | ||||
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
6 files changed, 9 insertions, 1 deletions
@@ -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 f1d31bb0c..3e850d614 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 b6313babc..821ff17b9 100644 --- a/config-debug +++ b/config-debug @@ -126,3 +126,5 @@ CONFIG_MAC80211_MESSAGE_TRACING=y CONFIG_EDAC_DEBUG=y CONFIG_SPI_DEBUG=y + +CONFIG_DEBUG_VM_PGFLAGS=y diff --git a/config-generic b/config-generic index 6e2c632f9..d569139e6 100644 --- a/config-generic +++ b/config-generic @@ -4864,7 +4864,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 0f05a0437..5a4319a57 100644 --- a/config-nodebug +++ b/config-nodebug @@ -126,3 +126,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_EDAC_DEBUG is not set # CONFIG_SPI_DEBUG is not set + +# CONFIG_DEBUG_VM_PGFLAGS is not set diff --git a/kernel.spec b/kernel.spec index 00e375fb9..b448a4777 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2147,6 +2147,9 @@ fi # # %changelog +* Mon May 16 2016 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) + * Mon May 16 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-1 - Linux v4.6 - CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410) |