13 files changed, 21 insertions, 16 deletions

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index e5dafa5ee1b2..0e3b61016931 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -416,7 +416,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts,
 
 int tcf_exts_validate(struct net *net, struct tcf_proto *tp,
                       struct nlattr **tb, struct nlattr *rate_tlv,
-                      struct tcf_exts *exts, bool ovr,
+                      struct tcf_exts *exts, bool ovr, bool rtnl_held,
                       struct netlink_ext_ack *extack);
 void tcf_exts_destroy(struct tcf_exts *exts);
 void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src);
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 3038a82f6591..a3e715d34efb 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -2841,7 +2841,7 @@ EXPORT_SYMBOL(tcf_exts_destroy);
 
 int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
                       struct nlattr *rate_tlv, struct tcf_exts *exts, bool ovr,
-                      struct netlink_ext_ack *extack)
+                      bool rtnl_held, struct netlink_ext_ack *extack)
 {
 #ifdef CONFIG_NET_CLS_ACT
         {
@@ -2851,7 +2851,8 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
                 if (exts->police && tb[exts->police]) {
                         act = tcf_action_init_1(net, tp, tb[exts->police],
                                                 rate_tlv, "police", ovr,
-                                                TCA_ACT_BIND, true, extack);
+                                                TCA_ACT_BIND, rtnl_held,
+                                                extack);
                         if (IS_ERR(act))
                                 return PTR_ERR(act);
 
@@ -2863,8 +2864,8 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
 
                         err = tcf_action_init(net, tp, tb[exts->action],
                                               rate_tlv, NULL, ovr, TCA_ACT_BIND,
-                                              exts->actions, &attr_size, true,
-                                              extack);
+                                              exts->actions, &attr_size,
+                                              rtnl_held, extack);
                         if (err < 0)
                                 return err;
                         exts->nr_actions = err;
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 4a57fec6f306..eaf9c02fe792 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -153,7 +153,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp,
 {
         int err;
 
-        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, true, extack);
         if (err < 0)
                 return err;
 
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index a95cb240a606..656b3423ad35 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -417,7 +417,8 @@ static int cls_bpf_set_parms(struct net *net, struct tcf_proto *tp,
         if ((!is_bpf && !is_ebpf) || (is_bpf && is_ebpf))
                 return -EINVAL;
 
-        ret = tcf_exts_validate(net, tp, tb, est, &prog->exts, ovr, extack);
+        ret = tcf_exts_validate(net, tp, tb, est, &prog->exts, ovr, true,
+                                extack);
         if (ret < 0)
                 return ret;
 
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 3bc01bdde165..663ee1c6d606 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -110,7 +110,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
                 goto errout;
 
         err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &new->exts, ovr,
-                                extack);
+                                true, extack);
         if (err < 0)
                 goto errout;
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 2bb043cd436b..39a6407d4832 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -445,7 +445,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
                 goto err2;
 
         err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &fnew->exts, ovr,
-                                extack);
+                                true, extack);
         if (err < 0)
                 goto err2;
 
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 6a341287a527..5e3f74ab68ca 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1272,7 +1272,8 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp,
 {
         int err;
 
-        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, true,
+                                extack);
         if (err < 0)
                 return err;
 
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 29eeeaf3ea44..c8173ebb69f2 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -217,7 +217,7 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
         int err;
 
         err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &f->exts, ovr,
-                                extack);
+                                true, extack);
         if (err < 0)
                 return err;
 
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index a1b803fd372e..8848a147c4bf 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -145,7 +145,8 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp,
 {
         int err;
 
-        err = tcf_exts_validate(net, tp, tb, est, &head->exts, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &head->exts, ovr, true,
+                                extack);
         if (err < 0)
                 return err;
 
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 0404aa5fa7cb..44b26038c4c4 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -393,7 +393,7 @@ static int route4_set_parms(struct net *net, struct tcf_proto *tp,
         struct route4_bucket *b;
         int err;
 
-        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, true, extack);
         if (err < 0)
                 return err;
 
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index e9ccf7daea7d..9dd9530e6a52 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -502,7 +502,8 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,
         err = tcf_exts_init(&e, TCA_RSVP_ACT, TCA_RSVP_POLICE);
         if (err < 0)
                 return err;
-        err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr, true,
+                                extack);
         if (err < 0)
                 goto errout2;
 
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 9ccc93f257db..b7dc667b6ec0 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -314,7 +314,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
         err = tcf_exts_init(&e, TCA_TCINDEX_ACT, TCA_TCINDEX_POLICE);
         if (err < 0)
                 return err;
-        err = tcf_exts_validate(net, tp, tb, est, &e, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &e, ovr, true, extack);
         if (err < 0)
                 goto errout;
 
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index dcea21004604..e891f30d42e9 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -726,7 +726,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
 {
         int err;
 
-        err = tcf_exts_validate(net, tp, tb, est, &n->exts, ovr, extack);
+        err = tcf_exts_validate(net, tp, tb, est, &n->exts, ovr, true, extack);
         if (err < 0)
                 return err;