| Message ID | 20220831041452.33026-1-shaozhengchao@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4bf8594a8036f42ca7ece1bbdaf45b7954fb09e6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: sched: gred: remove NULL check before free table->tab in gred_destroy() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Paolo Abeni <pabeni@redhat.com>: On Wed, 31 Aug 2022 12:14:52 +0800 you wrote: > The kfree invoked by gred_destroy_vq checks whether the input parameter > is empty. Therefore, gred_destroy() doesn't need to check table->tab. > > Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> > --- > net/sched/sch_gred.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Here is the summary with links: - [net-next] net: sched: gred: remove NULL check before free table->tab in gred_destroy() https://git.kernel.org/netdev/net-next/c/4bf8594a8036 You are awesome, thank you!
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index e7af53f607bb..48da8ac8419e 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -911,10 +911,9 @@ static void gred_destroy(struct Qdisc *sch) struct gred_sched *table = qdisc_priv(sch); int i; - for (i = 0; i < table->DPs; i++) { - if (table->tab[i]) - gred_destroy_vq(table->tab[i]); - } + for (i = 0; i < table->DPs; i++) + gred_destroy_vq(table->tab[i]); + gred_offload(sch, TC_GRED_DESTROY); kfree(table->opt); }
The kfree invoked by gred_destroy_vq checks whether the input parameter is empty. Therefore, gred_destroy() doesn't need to check table->tab. Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> --- net/sched/sch_gred.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)