summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPeilin Ye <peilin.ye@bytedance.com>2023-05-29 12:53:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-09 10:23:56 +0200
commit5bbf0bd10818f3e647e54e292ce876903373d51d (patch)
treea233f25371900d72751e398f395a925c6c3ccc5c /net
parent1efc22ce4a6952d7cf7d543a497d8018ef41ccd9 (diff)
downloadlinux-stable-5bbf0bd10818f3e647e54e292ce876903373d51d.tar.gz
linux-stable-5bbf0bd10818f3e647e54e292ce876903373d51d.tar.bz2
linux-stable-5bbf0bd10818f3e647e54e292ce876903373d51d.zip
net/sched: sch_clsact: Only create under TC_H_CLSACT
[ Upstream commit 5eeebfe6c493192b10d516abfd72742900f2a162 ] clsact Qdiscs are only supposed to be created under TC_H_CLSACT (which equals TC_H_INGRESS). Return -EOPNOTSUPP if 'parent' is not TC_H_CLSACT. Fixes: 1f211a1b929c ("net, sched: add clsact qdisc") Tested-by: Pedro Tammela <pctammela@mojatatu.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Vlad Buslov <vladbu@nvidia.com> Signed-off-by: Peilin Ye <peilin.ye@bytedance.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_ingress.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 2abc87a74ce4..e120dadc259a 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -221,6 +221,9 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
struct net_device *dev = qdisc_dev(sch);
int err;
+ if (sch->parent != TC_H_CLSACT)
+ return -EOPNOTSUPP;
+
net_inc_ingress_queue();
net_inc_egress_queue();
@@ -248,6 +251,9 @@ static void clsact_destroy(struct Qdisc *sch)
{
struct clsact_sched_data *q = qdisc_priv(sch);
+ if (sch->parent != TC_H_CLSACT)
+ return;
+
tcf_block_put_ext(q->egress_block, sch, &q->egress_block_info);
tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);