net: sched: don't release reference on action overwrite

Return from action init function with reference to action taken,
even when overwriting existing action.

Action init API initializes its fourth argument (pointer to pointer to tc
action) to either existing action with same index or newly created action.
In case of existing index(and bind argument is zero), init function returns
without incrementing action reference counter. Caller of action init then
proceeds working with action, without actually holding reference to it.
This means that action could be deleted concurrently.

Change action init behavior to always take reference to action before
returning successfully, in order to protect from concurrent deletion.
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/sched/act_api.c

@@ -870,8 +870,6 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
 		}
 		act->order = i;
 		sz += tcf_action_fill_size(act);
-		if (ovr)
-			refcount_inc(&act->tcfa_refcnt);
 		list_add_tail(&act->list, actions);
 	}
 

net/sched/act_bpf.c

@@ -311,10 +311,11 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 		if (bind)
 			return 0;
 
+		if (!replace) {
 			tcf_idr_release(*act, bind);
-		if (!replace)
 			return -EEXIST;
 		}
+	}
 
 	is_bpf = tb[TCA_ACT_BPF_OPS_LEN] && tb[TCA_ACT_BPF_OPS];
 	is_ebpf = tb[TCA_ACT_BPF_FD];
@@ -356,7 +357,6 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 
 	return res;
 out:
-	if (res == ACT_P_CREATED)
 	tcf_idr_release(*act, bind);
 
 	return ret;

net/sched/act_connmark.c

@@ -135,9 +135,10 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla,
 		ci = to_connmark(*a);
 		if (bind)
 			return 0;
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
+		}
 		/* replacing action and zone */
 		ci->tcf_action = parm->action;
 		ci->zone = parm->zone;

net/sched/act_csum.c

@@ -76,17 +76,17 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
 	} else {
 		if (bind)/* dont override defaults */
 			return 0;
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
 		}
+	}
 
 	p = to_tcf_csum(*a);
 	ASSERT_RTNL();
 
 	params_new = kzalloc(sizeof(*params_new), GFP_KERNEL);
 	if (unlikely(!params_new)) {
-		if (ret == ACT_P_CREATED)
 		tcf_idr_release(*a, bind);
 		return -ENOMEM;
 	}

net/sched/act_gact.c

@@ -100,10 +100,11 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
 	} else {
 		if (bind)/* dont override defaults */
 			return 0;
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
 		}
+	}
 
 	gact = to_gact(*a);
 

net/sched/act_ife.c

@@ -498,13 +498,11 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 			return ret;
 		}
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr) {
 		kfree(p);
 		return -EEXIST;
 	}
-	}
 
 	ife = to_ife(*a);
 	p->flags = parm->flags;
@@ -548,6 +546,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 
 			if (exists)
 				spin_unlock_bh(&ife->tcf_lock);
+			tcf_idr_release(*a, bind);
+
 			kfree(p);
 			return err;
 		}

net/sched/act_ipt.c

@@ -145,11 +145,12 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,
 	} else {
 		if (bind)/* dont override defaults */
 			return 0;
-		tcf_idr_release(*a, bind);
 
-		if (!ovr)
+		if (!ovr) {
+			tcf_idr_release(*a, bind);
 			return -EEXIST;
 		}
+	}
 	hook = nla_get_u32(tb[TCA_IPT_HOOK]);
 
 	err = -ENOMEM;

net/sched/act_mirred.c

@@ -132,9 +132,8 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
 		if (ret)
 			return ret;
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr)
 		return -EEXIST;
 	}
 	m = to_mirred(*a);

net/sched/act_nat.c

@@ -66,10 +66,11 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
 	} else {
 		if (bind)
 			return 0;
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
 		}
+	}
 	p = to_tcf_nat(*a);
 
 	spin_lock_bh(&p->tcf_lock);

net/sched/act_pedit.c

@@ -194,8 +194,8 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
 	} else {
 		if (bind)
 			goto out_free;
-		tcf_idr_release(*a, bind);
 		if (!ovr) {
+			tcf_idr_release(*a, bind);
 			ret = -EEXIST;
 			goto out_free;
 		}

net/sched/act_police.c

@@ -111,9 +111,8 @@ static int tcf_act_police_init(struct net *net, struct nlattr *nla,
 		if (ret)
 			return ret;
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr)
 		return -EEXIST;
 	}
 
@@ -195,7 +194,6 @@ static int tcf_act_police_init(struct net *net, struct nlattr *nla,
 failure:
 	qdisc_put_rtab(P_tab);
 	qdisc_put_rtab(R_tab);
-	if (ret == ACT_P_CREATED)
 	tcf_idr_release(*a, bind);
 	return err;
 }

net/sched/act_sample.c

@@ -69,9 +69,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
 		if (ret)
 			return ret;
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr)
 		return -EEXIST;
 	}
 	s = to_sample(*a);
@@ -81,7 +80,6 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
 	s->psample_group_num = nla_get_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP]);
 	psample_group = psample_group_get(net, s->psample_group_num);
 	if (!psample_group) {
-		if (ret == ACT_P_CREATED)
 		tcf_idr_release(*a, bind);
 		return -ENOMEM;
 	}

net/sched/act_simple.c

@@ -127,9 +127,10 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
 	} else {
 		d = to_defact(*a);
 
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
+		}
 
 		reset_policy(d, tb[TCA_DEF_DATA], parm);
 	}

net/sched/act_skbedit.c

@@ -172,10 +172,11 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
 		ret = ACT_P_CREATED;
 	} else {
 		d = to_skbedit(*a);
+		if (!ovr) {
 			tcf_idr_release(*a, bind);
-		if (!ovr)
 			return -EEXIST;
 		}
+	}
 
 	spin_lock_bh(&d->tcf_lock);
 

net/sched/act_skbmod.c

@@ -145,9 +145,8 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
 			return ret;
 
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr)
 		return -EEXIST;
 	}
 
@@ -156,7 +155,6 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
 	ASSERT_RTNL();
 	p = kzalloc(sizeof(struct tcf_skbmod_params), GFP_KERNEL);
 	if (unlikely(!p)) {
-		if (ret == ACT_P_CREATED)
 		tcf_idr_release(*a, bind);
 		return -ENOMEM;
 	}

net/sched/act_tunnel_key.c

@@ -329,20 +329,17 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
 		}
 
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr) {
 		NL_SET_ERR_MSG(extack, "TC IDR already exists");
 		return -EEXIST;
 	}
-	}
 
 	t = to_tunnel_key(*a);
 
 	ASSERT_RTNL();
 	params_new = kzalloc(sizeof(*params_new), GFP_KERNEL);
 	if (unlikely(!params_new)) {
-		if (ret == ACT_P_CREATED)
 		tcf_idr_release(*a, bind);
 		NL_SET_ERR_MSG(extack, "Cannot allocate tunnel key parameters");
 		return -ENOMEM;

net/sched/act_vlan.c

@@ -187,9 +187,8 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
 			return ret;
 
 		ret = ACT_P_CREATED;
-	} else {
+	} else if (!ovr) {
 		tcf_idr_release(*a, bind);
-		if (!ovr)
 		return -EEXIST;
 	}
 
@@ -198,7 +197,6 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
 	ASSERT_RTNL();
 	p = kzalloc(sizeof(*p), GFP_KERNEL);
 	if (!p) {
-		if (ret == ACT_P_CREATED)
 		tcf_idr_release(*a, bind);
 		return -ENOMEM;
 	}