netdev - [PATCH net] net: sched: cbq: stop timer in cbq_destroy() when cbq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221022104054.221968-1-shaozhengchao@huawei.com>
Date:   Sat, 22 Oct 2022 18:40:54 +0800
From:   Zhengchao Shao <shaozhengchao@...wei.com>
To:     <netdev@...r.kernel.org>, <jhs@...atatu.com>,
        <xiyou.wangcong@...il.com>, <jiri@...nulli.us>,
        <davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>,
        <pabeni@...hat.com>
CC:     <kaber@...sh.net>, <weiyongjun1@...wei.com>,
        <yuehaibing@...wei.com>, <shaozhengchao@...wei.com>
Subject: [PATCH net] net: sched: cbq: stop timer in cbq_destroy() when cbq_init() fails

When qdisc_create() fails to invoke the cbq_init() function for
initialization, the timer has been started. But cbq_destroy() doesn't
stop the timer. Fix it.

Fixes: 88a993540a65 ("[NET_SCHED]: sch_cbq: use hrtimer based watchdog")
Signed-off-by: Zhengchao Shao <shaozhengchao@...wei.com>
---
 net/sched/sch_cbq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 6568e17c4c63..8fcdd74af4cc 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1371,6 +1371,7 @@ static void cbq_destroy(struct Qdisc *sch)
 #ifdef CONFIG_NET_CLS_ACT
 	q->rx_class = NULL;
 #endif
+	qdisc_watchdog_cancel(&q->watchdog);
 	/*
 	 * Filters must be destroyed first because we don't destroy the
 	 * classes from root to leafs which means that filters can still
-- 
2.17.1