diff mbox series

[SRU,OEM-6.0,2/2] UBUNTU: [Config]: Make sure CONFIG_NET_CLS_TCINDEX is not available

Message ID 20230413211114.3130540-13-cascardo@canonical.com
State New
Headers show
Series None | 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.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 mbox series

Patch

diff --git a/debian.oem/abi/amd64/oem.modules b/debian.oem/abi/amd64/oem.modules
index 971a188d755c..6939ba49c623 100644
--- a/debian.oem/abi/amd64/oem.modules
+++ b/debian.oem/abi/amd64/oem.modules
@@ -840,7 +840,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 840a83b5280e..3f94290df331 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/config/annotations
@@ -12761,7 +12761,7 @@  CONFIG_NET_SCH_INGRESS                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_SCH_PLUG                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_SCH_ETS                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_BASIC                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
+CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 'riscv64': '-', 's390x': '-'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_U32                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index ef8acb750609..80bd9f21b055 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -5225,7 +5225,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