diff mbox series

net: sched: skip an unnecessay check

Message ID 20200907180438.11983-1-trix@redhat.com
State New
Headers show
Series net: sched: skip an unnecessay check | expand

Commit Message

Tom Rix Sept. 7, 2020, 6:04 p.m. UTC 
From: Tom Rix <trix@redhat.com>

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 <trix@redhat.com>
---
 net/sched/act_api.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

David Miller Sept. 9, 2020, 2:34 a.m. UTC | #1 
From: trix@redhat.com
Date: Mon,  7 Sep 2020 11:04:38 -0700

> From: Tom Rix <trix@redhat.com>
> 
> 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 <trix@redhat.com>

Applied to net-next, thank you.
diff mbox series

Patch

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 063d8aaf2900..f64af9d9dfee 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -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);
 }