Skip to content

Commit 8612aec

Browse files
committed
net/sched: Retire tcindex classifier
jira VULN-7630 cve CVE-2023-1829 commit-author Jamal Hadi Salim <[email protected]> commit 8c710f7 upstream-diff Changes not in `ciqcbr7_9': 1. No changes to `include/net/tc_wrapper.h' as this file was introduced much later, in v6.2, and has no predecessor in `ciqcbr7_9'. 2. No changes to `tools/testing/selftests/tc-testing/tc-tests/filters/tcindex.json' as this file is part of `tc' testing which `ciqcbr7_9' lacks entirely. Changes not in the upstream: 1. Removal of `CONFIG_NET_CLS_TCINDEX' options from the files in `configs/*' - the upstream doesn't keep config files under version control unlike Rocky. The tcindex classifier has served us well for about a quarter of a century but has not been getting much TLC due to lack of known users. Most recently it has become easy prey to syzkaller. For this reason, we are retiring it. Signed-off-by: Jamal Hadi Salim <[email protected]> Acked-by: Jiri Pirko <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> (cherry picked from commit 8c710f7) Signed-off-by: Marcin Wcisło <[email protected]>
1 parent 3067830 commit 8612aec

File tree

5 files changed

+0
-714
lines changed

5 files changed

+0
-714
lines changed

configs/kernel-3.10.0-x86_64-debug.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,6 @@ CONFIG_NET_SCH_PLUG=m
13531353
#
13541354
CONFIG_NET_CLS=y
13551355
CONFIG_NET_CLS_BASIC=m
1356-
CONFIG_NET_CLS_TCINDEX=m
13571356
CONFIG_NET_CLS_ROUTE4=m
13581357
CONFIG_NET_CLS_FW=m
13591358
CONFIG_NET_CLS_U32=m

configs/kernel-3.10.0-x86_64.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,6 @@ CONFIG_NET_SCH_PLUG=m
13571357
#
13581358
CONFIG_NET_CLS=y
13591359
CONFIG_NET_CLS_BASIC=m
1360-
CONFIG_NET_CLS_TCINDEX=m
13611360
CONFIG_NET_CLS_ROUTE4=m
13621361
CONFIG_NET_CLS_FW=m
13631362
CONFIG_NET_CLS_U32=m

net/sched/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -423,17 +423,6 @@ config NET_CLS_BASIC
423423
To compile this code as a module, choose M here: the
424424
module will be called cls_basic.
425425

426-
config NET_CLS_TCINDEX
427-
tristate "Traffic-Control Index (TCINDEX)"
428-
select NET_CLS
429-
---help---
430-
Say Y here if you want to be able to classify packets based on
431-
traffic control indices. You will want this feature if you want
432-
to implement Differentiated Services together with DSMARK.
433-
434-
To compile this code as a module, choose M here: the
435-
module will be called cls_tcindex.
436-
437426
config NET_CLS_ROUTE4
438427
tristate "Routing decision (ROUTE)"
439428
depends on INET

net/sched/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ obj-$(CONFIG_NET_CLS_U32) += cls_u32.o
5757
obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o
5858
obj-$(CONFIG_NET_CLS_FW) += cls_fw.o
5959
obj-$(CONFIG_NET_CLS_RSVP) += cls_rsvp.o
60-
obj-$(CONFIG_NET_CLS_TCINDEX) += cls_tcindex.o
6160
obj-$(CONFIG_NET_CLS_RSVP6) += cls_rsvp6.o
6261
obj-$(CONFIG_NET_CLS_BASIC) += cls_basic.o
6362
obj-$(CONFIG_NET_CLS_FLOW) += cls_flow.o

0 commit comments

Comments
 (0)