From nobody Mon Apr 6 21:57:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE26CC6FA83 for ; Fri, 2 Sep 2022 08:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235779AbiIBIc0 (ORCPT ); Fri, 2 Sep 2022 04:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235472AbiIBIcO (ORCPT ); Fri, 2 Sep 2022 04:32:14 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC0DEC0E71; Fri, 2 Sep 2022 01:32:13 -0700 (PDT) Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MJrhG1my7zHncy; Fri, 2 Sep 2022 16:30:22 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 2 Sep 2022 16:32:11 +0800 From: Zhengchao Shao To: , , , , , , , , CC: , , Subject: [PATCH net-next,v2 2/2] net: sched: htb: remove redundant resource cleanup in htb_init() Date: Fri, 2 Sep 2022 16:34:30 +0800 Message-ID: <20220902083430.24378-3-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220902083430.24378-1-shaozhengchao@huawei.com> References: <20220902083430.24378-1-shaozhengchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500026.china.huawei.com (7.185.36.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If htb_init() fails, qdisc_create() invokes htb_destroy() to clear resources. Therefore, remove redundant resource cleanup in htb_init(). Signed-off-by: Zhengchao Shao --- v1: rebase --- net/sched/sch_htb.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index dbbb276aecb3..78d0c7549c74 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1102,7 +1102,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr = *opt, =20 err =3D qdisc_class_hash_init(&q->clhash); if (err < 0) - goto err_free_direct_qdiscs; + return err; =20 if (tb[TCA_HTB_DIRECT_QLEN]) q->direct_qlen =3D nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]); @@ -1123,8 +1123,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr = *opt, qdisc =3D qdisc_create_dflt(dev_queue, &pfifo_qdisc_ops, TC_H_MAKE(sch->handle, 0), extack); if (!qdisc) { - err =3D -ENOMEM; - goto err_free_qdiscs; + return -ENOMEM; } =20 htb_set_lockdep_class_child(qdisc); @@ -1142,7 +1141,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr = *opt, }; err =3D htb_offload(dev, &offload_opt); if (err) - goto err_free_qdiscs; + return err; =20 /* Defer this assignment, so that htb_destroy skips offload-related * parts (especially calling ndo_setup_tc) on errors. @@ -1150,22 +1149,6 @@ static int htb_init(struct Qdisc *sch, struct nlattr= *opt, q->offload =3D true; =20 return 0; - -err_free_qdiscs: - for (ntx =3D 0; ntx < q->num_direct_qdiscs && q->direct_qdiscs[ntx]; - ntx++) - qdisc_put(q->direct_qdiscs[ntx]); - - qdisc_class_hash_destroy(&q->clhash); - /* Prevent use-after-free and double-free when htb_destroy gets called. - */ - q->clhash.hash =3D NULL; - q->clhash.hashsize =3D 0; - -err_free_direct_qdiscs: - kfree(q->direct_qdiscs); - q->direct_qdiscs =3D NULL; - return err; } =20 static void htb_attach_offload(struct Qdisc *sch) @@ -1688,13 +1671,12 @@ static void htb_destroy(struct Qdisc *sch) qdisc_class_hash_destroy(&q->clhash); __qdisc_reset_queue(&q->direct_queue); =20 - if (!q->offload) - return; - - offload_opt =3D (struct tc_htb_qopt_offload) { - .command =3D TC_HTB_DESTROY, - }; - htb_offload(dev, &offload_opt); + if (q->offload) { + offload_opt =3D (struct tc_htb_qopt_offload) { + .command =3D TC_HTB_DESTROY, + }; + htb_offload(dev, &offload_opt); + } =20 if (!q->direct_qdiscs) return; --=20 2.17.1