Skip to content

Commit

Permalink
net_sched: remove a redundant goto chain check
Browse files Browse the repository at this point in the history
[ Upstream commit 1aad804 ]

All TC actions call tcf_action_check_ctrlact() to validate
goto chain, so this check in tcf_action_init_1() is actually
redundant. Remove it to save troubles of leaking memory.

Fixes: e49d8c2 ("net_sched: defer tcf_idr_insert() in tcf_action_init_1()")
Reported-by: Vlad Buslov <vladbu@mellanox.com>
Suggested-by: Davide Caratti <dcaratti@redhat.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
congwang authored and gregkh committed Oct 29, 2020
1 parent ba05057 commit c5b868e
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions net/sched/act_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -706,13 +706,6 @@ int tcf_action_destroy(struct tc_action *actions[], int bind)
return ret;
}

static int tcf_action_destroy_1(struct tc_action *a, int bind)
{
struct tc_action *actions[] = { a, NULL };

return tcf_action_destroy(actions, bind);
}

static int tcf_action_put(struct tc_action *p)
{
return __tcf_action_put(p, false);
Expand Down Expand Up @@ -932,13 +925,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
if (err < 0)
goto err_mod;

if (TC_ACT_EXT_CMP(a->tcfa_action, TC_ACT_GOTO_CHAIN) &&
!rcu_access_pointer(a->goto_chain)) {
tcf_action_destroy_1(a, bind);
NL_SET_ERR_MSG(extack, "can't use goto chain with NULL chain");
return ERR_PTR(-EINVAL);
}

if (!name && tb[TCA_ACT_COOKIE])
tcf_set_action_cookie(&a->act_cookie, cookie);

Expand Down

0 comments on commit c5b868e

Please sign in to comment.