net: sched: atomically check-allocate action

[thirdparty/kernel/stable.git] / net / sched / act_bpf.c

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index d3f4ac6f2c4ba3fd0021b42d19975f86a0f94b45..06f743d8ed4130bc3cc53996ecb9313546230066 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -299,14 +299,17 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 
        parm = nla_data(tb[TCA_ACT_BPF_PARMS]);
 
-       if (!tcf_idr_check(tn, parm->index, act, bind)) {
+       ret = tcf_idr_check_alloc(tn, &parm->index, act, bind);
+       if (!ret) {
                ret = tcf_idr_create(tn, parm->index, est, act,
                                     &act_bpf_ops, bind, true);
-               if (ret < 0)
+               if (ret < 0) {
+                       tcf_idr_cleanup(tn, parm->index);
                        return ret;
+               }
 
                res = ACT_P_CREATED;
-       } else {
+       } else if (ret > 0) {
                /* Don't override defaults. */
                if (bind)
                        return 0;
@@ -315,6 +318,8 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
                        tcf_idr_release(*act, bind);
                        return -EEXIST;
                }
+       } else {
+               return ret;
        }
 
        is_bpf = tb[TCA_ACT_BPF_OPS_LEN] && tb[TCA_ACT_BPF_OPS];