diff mbox series

[SRU,Bionic,2/2] UBUNTU: [Config]: Make sure CONFIG_NET_CLS_TCINDEX is not available

Message ID 20230413211114.3130540-3-cascardo@canonical.com
State New
Headers show
Series CVE-2023-1829 | expand

Commit Message

Thadeu Lima de Souza Cascardo April 13, 2023, 9:11 p.m. UTC 
CVE-2023-1829
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 debian.master/abi/4.15.0-207.218/amd64/generic.modules      | 1 -
 debian.master/abi/4.15.0-207.218/amd64/lowlatency.modules   | 1 -
 debian.master/abi/4.15.0-207.218/arm64/generic.modules      | 1 -
 debian.master/abi/4.15.0-207.218/armhf/generic-lpae.modules | 1 -
 debian.master/abi/4.15.0-207.218/armhf/generic.modules      | 1 -
 debian.master/abi/4.15.0-207.218/i386/generic.modules       | 1 -
 debian.master/abi/4.15.0-207.218/i386/lowlatency.modules    | 1 -
 debian.master/abi/4.15.0-207.218/ppc64el/generic.modules    | 1 -
 debian.master/abi/4.15.0-207.218/s390x/generic.modules      | 1 -
 debian.master/config/annotations                            | 2 +-
 debian.master/config/config.common.ubuntu                   | 1 -
 11 files changed, 1 insertion(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/abi/4.15.0-207.218/amd64/generic.modules b/debian.master/abi/4.15.0-207.218/amd64/generic.modules
index e16b0b91ef51..29e6a524c4fb 100644
--- a/debian.master/abi/4.15.0-207.218/amd64/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/amd64/generic.modules
@@ -701,7 +701,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/amd64/lowlatency.modules b/debian.master/abi/4.15.0-207.218/amd64/lowlatency.modules
index 87cde9cc7b57..e2f43db16542 100644
--- a/debian.master/abi/4.15.0-207.218/amd64/lowlatency.modules
+++ b/debian.master/abi/4.15.0-207.218/amd64/lowlatency.modules
@@ -702,7 +702,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/arm64/generic.modules b/debian.master/abi/4.15.0-207.218/arm64/generic.modules
index fd314e4ccd38..a14ca51a8e8f 100644
--- a/debian.master/abi/4.15.0-207.218/arm64/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/arm64/generic.modules
@@ -718,7 +718,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/armhf/generic-lpae.modules b/debian.master/abi/4.15.0-207.218/armhf/generic-lpae.modules
index 7f11b861a23b..56256ed44888 100644
--- a/debian.master/abi/4.15.0-207.218/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.15.0-207.218/armhf/generic-lpae.modules
@@ -689,7 +689,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/armhf/generic.modules b/debian.master/abi/4.15.0-207.218/armhf/generic.modules
index 1d23b0995e16..1be00ab329ab 100644
--- a/debian.master/abi/4.15.0-207.218/armhf/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/armhf/generic.modules
@@ -697,7 +697,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/i386/generic.modules b/debian.master/abi/4.15.0-207.218/i386/generic.modules
index d0d31e9f8bc6..e872f5d73780 100644
--- a/debian.master/abi/4.15.0-207.218/i386/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/i386/generic.modules
@@ -711,7 +711,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/i386/lowlatency.modules b/debian.master/abi/4.15.0-207.218/i386/lowlatency.modules
index 0d951355f8ee..f36f5546b9d2 100644
--- a/debian.master/abi/4.15.0-207.218/i386/lowlatency.modules
+++ b/debian.master/abi/4.15.0-207.218/i386/lowlatency.modules
@@ -712,7 +712,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/ppc64el/generic.modules b/debian.master/abi/4.15.0-207.218/ppc64el/generic.modules
index c5e0e74f2c42..c598e0b223d8 100644
--- a/debian.master/abi/4.15.0-207.218/ppc64el/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/ppc64el/generic.modules
@@ -634,7 +634,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/4.15.0-207.218/s390x/generic.modules b/debian.master/abi/4.15.0-207.218/s390x/generic.modules
index fc02ae5d8950..8dd625dfc604 100644
--- a/debian.master/abi/4.15.0-207.218/s390x/generic.modules
+++ b/debian.master/abi/4.15.0-207.218/s390x/generic.modules
@@ -95,7 +95,6 @@  cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cmac
 coda
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 41acf272530a..4fdad703ed24 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10541,7 +10541,7 @@  CONFIG_NET_SCH_PIE                              policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_SCH_INGRESS                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_SCH_PLUG                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_BASIC                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'i386': '-', 'ppc64el': '-', 's390x': '-'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_RSVP                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6eb88c6cc209..e7c5a2b03131 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5872,7 +5872,6 @@  CONFIG_NET_CLS_MATCHALL=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m