[SRU OEM-5.17 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.oem/abi/amd64/oem.modules       | 1 -
 debian.oem/config/annotations          | 2 +-
 debian.oem/config/config.common.ubuntu | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian.oem/abi/amd64/oem.modules b/debian.oem/abi/amd64/oem.modules
index bd7f0e92f571..71cb9ea6eced 100644
--- a/debian.oem/abi/amd64/oem.modules
+++ b/debian.oem/abi/amd64/oem.modules
@@ -830,7 +830,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
index 25fe308b53b8..1d1ea5245586 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/config/annotations
@@ -12826,7 +12826,7 @@ CONFIG_NET_SCH_INGRESS                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_SCH_PLUG                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_SCH_ETS                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_BASIC                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 's390x': '-'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_U32                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index 7949c3309bb9..30088e39ad6c 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -5127,7 +5127,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