Turn off DCCP

The DCCP protocol has had a number of bugs recently and people keep
finding more. It hasn't been well maintained and there is talk of
removing it from the kernel. It doesn't seem to be highly used so
just turn it off.

14 files changed, 16 insertions, 13 deletions

diff --git a/baseconfig/CONFIG_IP_DCCP b/baseconfig/CONFIG_IP_DCCP
index 26ba41376..6ecb43a3e 100644
--- a/baseconfig/CONFIG_IP_DCCP
+++ b/baseconfig/CONFIG_IP_DCCP
@@ -1 +1 @@
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7454cb4dd..a7129300b 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2210,7 +2210,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index cc64f9559..6e16987df 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2228,7 +2228,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 6eb455f49..a0f5cbddc 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2228,7 +2228,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-i686.config b/kernel-i686.config
index ecfc1576f..d05557f60 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2210,7 +2210,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index a076f483f..a566c4acb 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2083,7 +2083,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 08f5584fd..61c2095b2 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2065,7 +2065,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 1998317b5..0185292f9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2028,7 +2028,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a8e43f019..e84b4ce22 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2010,7 +2010,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6ed231359..1e6f4f541 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1980,7 +1980,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 734d86b26..bbf3ba1ec 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1962,7 +1962,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index be912f757..57d8ec60c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2283,7 +2283,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 32262b2a0..d791f80a2 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2265,7 +2265,7 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP=m
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/kernel.spec b/kernel.spec
index e5849805c..13ce3e0e2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2213,6 +2213,9 @@ fi
 #
 #
 %changelog
+* Thu Oct 19 2017 Laura Abbott <labbott@redhat.com>
+- Turn off DCCP
+
 * Wed Oct 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc5.git2.1
 - Linux v4.14-rc5-22-g3e0cc09a3a2c