]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: sched: Fix qdisc_rate_table refcount leak when get tcf_block failed
authorXiyu Yang <xiyuyang19@fudan.edu.cn>
Sun, 29 Aug 2021 15:58:01 +0000 (23:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 07:50:45 +0000 (09:50 +0200)
[ Upstream commit c66070125837900163b81a03063ddd657a7e9bfb ]

The reference counting issue happens in one exception handling path of
cbq_change_class(). When failing to get tcf_block, the function forgets
to decrease the refcount of "rtab" increased by qdisc_put_rtab(),
causing a refcount leak.

Fix this issue by jumping to "failure" label when get tcf_block failed.

Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Reviewed-by: Cong Wang <cong.wang@bytedance.com>
Link: https://lore.kernel.org/r/1630252681-71588-1-git-send-email-xiyuyang19@fudan.edu.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sched/sch_cbq.c

index 53d45e029c36d46b9e4f0d1005ef98c468fdd085..4a78fcf5d4f989a78f2ced9301e9bcd15232d7e2 100644 (file)
@@ -1614,7 +1614,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
        err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack);
        if (err) {
                kfree(cl);
-               return err;
+               goto failure;
        }
 
        if (tca[TCA_RATE]) {