Message ID | 20230413211114.3130540-7-cascardo@canonical.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules index 360d03ef923a..04df13fe178b 100644 --- a/debian.master/abi/amd64/generic.modules +++ b/debian.master/abi/amd64/generic.modules @@ -804,7 +804,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules index 0842aabad957..120afafa766d 100644 --- a/debian.master/abi/arm64/generic-64k.modules +++ b/debian.master/abi/arm64/generic-64k.modules @@ -880,7 +880,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules index 5368ebe75cff..7bf849ce08e0 100644 --- a/debian.master/abi/arm64/generic.modules +++ b/debian.master/abi/arm64/generic.modules @@ -880,7 +880,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules index 54d59ec07733..acb00b75ac99 100644 --- a/debian.master/abi/armhf/generic-lpae.modules +++ b/debian.master/abi/armhf/generic-lpae.modules @@ -830,7 +830,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules index 9f95f1900de6..6e732b60f5fb 100644 --- a/debian.master/abi/armhf/generic.modules +++ b/debian.master/abi/armhf/generic.modules @@ -839,7 +839,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules index ae2c32244800..196a8663cd72 100644 --- a/debian.master/abi/ppc64el/generic.modules +++ b/debian.master/abi/ppc64el/generic.modules @@ -761,7 +761,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules index 90de6937ccc7..dccd1954e7e3 100644 --- a/debian.master/abi/s390x/generic.modules +++ b/debian.master/abi/s390x/generic.modules @@ -112,7 +112,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 e24b4d05ff1f..d8400600cd2b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12937,7 +12937,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.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 39840e1aa2af..c5c5deae73ca 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6880,7 +6880,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
CVE-2023-1829 Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.master/abi/amd64/generic.modules | 1 - debian.master/abi/arm64/generic-64k.modules | 1 - debian.master/abi/arm64/generic.modules | 1 - debian.master/abi/armhf/generic-lpae.modules | 1 - debian.master/abi/armhf/generic.modules | 1 - debian.master/abi/ppc64el/generic.modules | 1 - debian.master/abi/s390x/generic.modules | 1 - debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 1 - 9 files changed, 1 insertion(+), 9 deletions(-)