summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index c2859f4ef..1ed50d4d0 100644
--- a/config-generic
+++ b/config-generic
@@ -5537,7 +5537,7 @@ CONFIG_NO_HZ=y
# CONFIG_SCHED_STACK_END_CHECK is not set
# CONFIG_DEBUG_TIMEKEEPING is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PERF_EVENTS=y
diff --git a/kernel.spec b/kernel.spec
index 966d0ecc9..dce6b945c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2181,6 +2181,9 @@ fi
#
#
%changelog
+* Tue Feb 14 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- CVE-2017-5967 Disable CONFIG_TIMER_STATS (rhbz 1422138 1422140)
+
* Mon Feb 13 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- CVE-2017-5970 keep skb->dst around in presence of IP options (rhbz 1421638)