Unverified Commit d127ee13 authored Jul 06, 2024 by openeuler-ci-bot Committed by Gitee Jul 06, 2024

!9797 sch_cake: do not call cake_destroy() from cake_init()

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiang Yang <xiangyang3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4ZQGMBFCWQBQ5SH4FJOSK4CQL3HWEHVB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SGX 
 
Link:https://gitee.com/openeuler/kernel/pulls/9797

 

Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 4949c945 4c318d91

net/sched/sch_cake.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -2675,7 +2675,7 @@ static int cake_init(struct Qdisc sch, struct nlattr opt,
		q->tins = kvcalloc(CAKE_MAX_TINS, sizeof(struct cake_tin_data),
		GFP_KERNEL);
		if (!q->tins)
		goto nomem;
		return -ENOMEM;

		for (i = 0; i < CAKE_MAX_TINS; i++) {
		struct cake_tin_data *b = q->tins + i;
		@@ -2705,10 +2705,6 @@ static int cake_init(struct Qdisc sch, struct nlattr opt,
		q->min_netlen = ~0;
		q->min_adjlen = ~0;
		return 0;

		nomem:
		cake_destroy(sch);
		return -ENOMEM;
		}

		static int cake_dump(struct Qdisc sch, struct sk_buff skb)