CVE-2017-5967 Disable CONFIG_TIMER_STATS (rhbz 1422138 1422140)

22 files changed, 27 insertions, 23 deletions

diff --git a/baseconfig/CONFIG_TIMER_STATS b/baseconfig/CONFIG_TIMER_STATS
index 71a68f162..0dfc820be 100644
--- a/baseconfig/CONFIG_TIMER_STATS
+++ b/baseconfig/CONFIG_TIMER_STATS
@@ -1 +1 @@
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7526300f3..aaa62672f 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5365,7 +5365,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 8f5b7cd60..1480fdadd 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5342,7 +5342,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index a346a7938..fc02abed9 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5889,7 +5889,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b250ca889..5e9eea8b9 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5535,7 +5535,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TI_MESSAGE_MANAGER=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8057d5d49..edab70506 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5513,7 +5513,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TI_MESSAGE_MANAGER=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e971cc899..2db6c062c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5867,7 +5867,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 0f1b6fb5b..eee845084 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5105,7 +5105,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 62886b151..af25ff3b6 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5126,7 +5126,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 6e5a684de..ed3a2134c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5126,7 +5126,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 0dffd51d6..d2ee83a55 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5105,7 +5105,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 414115223..2b395d8bd 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4965,7 +4965,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 9b1623c62..7b12835cd 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4942,7 +4942,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 14c3d83c6..f1f36d10d 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4894,7 +4894,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e565b2f54..2f6833602 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4871,7 +4871,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index d1cb17fb7..726e805bb 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4893,7 +4893,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index a1f6c20f7..84188197d 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4870,7 +4870,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 61a9964a1..d6f84bf35 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4786,7 +4786,7 @@ CONFIG_TIFM_7XX1=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2743434dd..38e361190 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4763,7 +4763,7 @@ CONFIG_TIFM_7XX1=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index be3f1db20..9f6a9501d 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5157,7 +5157,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index be6185d94..dfadb1220 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5136,7 +5136,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_TIMER_STATS=y
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
diff --git a/kernel.spec b/kernel.spec
index bcbed7ad6..c37cfd513 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -125,7 +125,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -2172,6 +2172,10 @@ fi
 #
 #
 %changelog
+* Tue Feb 14 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git0.2
+- Reenable debugging options.
+- CVE-2017-5967 Disable CONFIG_TIMER_STATS (rhbz 1422138 1422140)
+
 * Mon Feb 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git0.1
 - Disable debugging options.
 - Linux v4.10-rc8