Commit f9bfc8eb authored Dec 01, 2023 by Pedro Tammela Committed by Paolo Abeni Dec 05, 2023

net/sched: act_api: use tcf_act_for_each_action in tcf_idr_insert_many

The actions array is contiguous, so stop processing whenever a NULL
is found. This is already the assumption for tcf_action_destroy[1],
which is called from tcf_actions_init.

[1] https://elixir.bootlin.com/linux/v6.7-rc3/source/net/sched/act_api.c#L1115



Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parent e09ac779

net/sched/act_api.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1285,14 +1285,12 @@ static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = {

		void tcf_idr_insert_many(struct tc_action *actions[])
		{
		struct tc_action *a;
		int i;

		for (i = 0; i < TCA_ACT_MAX_PRIO; i++) {
		struct tc_action *a = actions[i];
		tcf_act_for_each_action(i, a, actions) {
		struct tcf_idrinfo *idrinfo;

		if (!a)
		continue;
		idrinfo = a->idrinfo;
		mutex_lock(&idrinfo->lock);
		/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc if