Commit c1f1f16c authored by Tom Rix's avatar Tom Rix Committed by David S. Miller
Browse files

net: sched: skip an unnecessay check 



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: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4349abdb

net/sched/act_api.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

}