net: sched: skip an unnecessay check
Subsystems (3)
PATCH 1/1 net: sched: skip an unnecessay check
From: Tom Rix <[email protected]>
Reviewing the error handling in tcf_action_init_1() most of the early handling uses
err_out:
if (cookie) {
kfree(cookie->data);
kfree(cookie);
}before cookie could ever be set.
So skip the unnecessay check.
Signed-off-by Tom Rix <[email protected]>
--- net/sched/act_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/act_api.c +3 -2
@@ -976,7 +976,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,#endif NL_SET_ERR_MSG (extack,"Failed to load TC action module" ); err = -ENOENT ; - goto err_out; + goto err_free; }/* backward compatibility for policer */
@@ -1013,11 +1013,12 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, err_mod:module_put (a_o->owner); -err_out: +err_free:if (cookie) {kfree (cookie->data);kfree (cookie); } +err_out:return ERR_PTR (err); }
Signature · 1 line
2.18.1
From: [email protected]
Date: Mon, 7 Sep 2020 11:04:38 -0700
Quoted 11 lines
From: Tom Rix <[email protected]>
Reviewing the error handling in
tcf_action_init_1()most of the early handling uses
err_out:if (cookie) { kfree(cookie->data); kfree(cookie); }
Quoted 5 lines
before cookie could ever be set.
So skip the unnecessay check.
Signed-off-by Tom Rix <[email protected]>
Applied to net-next, thank you.