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

[Thadeu Lima de Souza Cascardo]

CVE-2023-1829
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian.master/abi/5.4.0-145.162/amd64/generic.modules      | 1 -
 debian.master/abi/5.4.0-145.162/amd64/lowlatency.modules   | 1 -
 debian.master/abi/5.4.0-145.162/arm64/generic.modules      | 1 -
 debian.master/abi/5.4.0-145.162/armhf/generic-lpae.modules | 1 -
 debian.master/abi/5.4.0-145.162/armhf/generic.modules      | 1 -
 debian.master/abi/5.4.0-145.162/ppc64el/generic.modules    | 1 -
 debian.master/abi/5.4.0-145.162/s390x/generic.modules      | 1 -
 debian.master/config/annotations                           | 2 +-
 debian.master/config/config.common.ubuntu                  | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian.master/abi/5.4.0-145.162/amd64/generic.modules b/debian.master/abi/5.4.0-145.162/amd64/generic.modules
index fe7adbb7858d..05d22fe9e840 100644
--- a/debian.master/abi/5.4.0-145.162/amd64/generic.modules
+++ b/debian.master/abi/5.4.0-145.162/amd64/generic.modules
@@ -753,7 +753,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/amd64/lowlatency.modules b/debian.master/abi/5.4.0-145.162/amd64/lowlatency.modules
index d44130186113..675d641956dc 100644
--- a/debian.master/abi/5.4.0-145.162/amd64/lowlatency.modules
+++ b/debian.master/abi/5.4.0-145.162/amd64/lowlatency.modules
@@ -754,7 +754,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/arm64/generic.modules b/debian.master/abi/5.4.0-145.162/arm64/generic.modules
index 274599ace40d..1df4a6f5f71c 100644
--- a/debian.master/abi/5.4.0-145.162/arm64/generic.modules
+++ b/debian.master/abi/5.4.0-145.162/arm64/generic.modules
@@ -797,7 +797,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/armhf/generic-lpae.modules b/debian.master/abi/5.4.0-145.162/armhf/generic-lpae.modules
index 71cd0ce5ecc8..6d693d90f845 100644
--- a/debian.master/abi/5.4.0-145.162/armhf/generic-lpae.modules
+++ b/debian.master/abi/5.4.0-145.162/armhf/generic-lpae.modules
@@ -763,7 +763,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/armhf/generic.modules b/debian.master/abi/5.4.0-145.162/armhf/generic.modules
index c32e6cb7d5ac..374b0b0dd748 100644
--- a/debian.master/abi/5.4.0-145.162/armhf/generic.modules
+++ b/debian.master/abi/5.4.0-145.162/armhf/generic.modules
@@ -768,7 +768,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/ppc64el/generic.modules b/debian.master/abi/5.4.0-145.162/ppc64el/generic.modules
index 3cf38e04649e..b6b767ad4041 100644
--- a/debian.master/abi/5.4.0-145.162/ppc64el/generic.modules
+++ b/debian.master/abi/5.4.0-145.162/ppc64el/generic.modules
@@ -684,7 +684,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/5.4.0-145.162/s390x/generic.modules b/debian.master/abi/5.4.0-145.162/s390x/generic.modules
index ba383365d636..603e775e03c1 100644
--- a/debian.master/abi/5.4.0-145.162/s390x/generic.modules
+++ b/debian.master/abi/5.4.0-145.162/s390x/generic.modules
@@ -108,7 +108,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 c4170bf2c547..9485aa36ecdc 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11759,7 +11759,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_U32                              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 a9f0945b7b8f..87af52fb551f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6274,7 +6274,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_DEVLINK=y
-- 
2.34.1