!13944 net/sched: accept TCA_STAB only for root qdisc
Merge Pull Request from: @ci-robot
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3ZH7BMWKGELAWN6FLTODU3PEANBAYYM6/
https://gitee.com/src-openeuler/kernel/issues/IAYRJQ
Link:https://gitee.com/openeuler/kernel/pulls/13944
Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: Li Nan <linan122@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index f78a2ea..4bed10e 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -838,7 +838,6 @@ static inline void qdisc_calculate_pkt_len(struct sk_buff *skb,
static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
struct sk_buff **to_free)
{
- qdisc_calculate_pkt_len(skb, sch);
return sch->enqueue(skb, sch, to_free);
}
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index b8eecd6..eff018a 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -590,7 +590,6 @@ void __qdisc_calculate_pkt_len(struct sk_buff *skb,
pkt_len = 1;
qdisc_skb_cb(skb)->pkt_len = pkt_len;
}
-EXPORT_SYMBOL(__qdisc_calculate_pkt_len);
void qdisc_warn_nonwc(const char *txt, struct Qdisc *qdisc)
{
@@ -1120,6 +1119,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
return -EINVAL;
}
+ if (new &&
+ !(parent->flags & TCQ_F_MQROOT) &&
+ rcu_access_pointer(new->stab)) {
+ NL_SET_ERR_MSG(extack, "STAB not supported on a non root");
+ return -EINVAL;
+ }
err = cops->graft(parent, cl, new, &old, extack);
if (err)
return err;
