Skip to content

Commit

Permalink
net sched actions: fix GETing actions
Browse files Browse the repository at this point in the history
With the batch changes that translated transient actions into
a temporary list lost in the translation was the fact that
tcf_action_destroy() will eventually delete the action from
the permanent location if the refcount is zero.

Example of what broke:
...add a gact action to drop
sudo $TC actions add action drop index 10
...now retrieve it, looks good
sudo $TC actions get action gact index 10
...retrieve it again and find it is gone!
sudo $TC actions get action gact index 10

Fixes: 22dc13c ("net_sched: convert tcf_exts from list to pointer array"),
Fixes: 824a7e8 ("net_sched: remove an unnecessary list_del()")
Fixes: f07fed8 ("net_sched: remove the leftover cleanup_a()")

Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
jhsmt authored and davem330 committed Sep 21, 2016
1 parent 1d9423a commit aecc5ce
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions net/sched/act_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,17 @@ struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
return ERR_PTR(err);
}

static void cleanup_a(struct list_head *actions, int ovr)
{
struct tc_action *a;

if (!ovr)
return;

list_for_each_entry(a, actions, list)
a->tcfa_refcnt--;
}

int tcf_action_init(struct net *net, struct nlattr *nla, struct nlattr *est,
char *name, int ovr, int bind, struct list_head *actions)
{
Expand All @@ -611,8 +622,15 @@ int tcf_action_init(struct net *net, struct nlattr *nla, struct nlattr *est,
goto err;
}
act->order = i;
if (ovr)
act->tcfa_refcnt++;
list_add_tail(&act->list, actions);
}

/* Remove the temp refcnt which was necessary to protect against
* destroying an existing action which was being replaced
*/
cleanup_a(actions, ovr);
return 0;

err:
Expand Down Expand Up @@ -882,6 +900,8 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
goto err;
}
act->order = i;
if (event == RTM_GETACTION)
act->tcfa_refcnt++;
list_add_tail(&act->list, &actions);
}

Expand Down

0 comments on commit aecc5ce

Please sign in to comment.