net/sched: sch_taprio: ensure to reset/destroy all child qdiscs
[ Upstream commit5.4-rM2-2.2.x-imx-squashed698285da79
] taprio_graft() can insert a NULL element in the array of child qdiscs. As a consquence, taprio_reset() might not reset child qdiscs completely, and taprio_destroy() might leak resources. Fix it by ensuring that loops that iterate over q->qdiscs[] don't end when they find the first NULL item. Fixes:44d4775ca5
("net/sched: sch_taprio: reset child qdiscs before freeing them") Fixes:5a781ccbd1
("tc: Add support for configuring the taprio scheduler") Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Davide Caratti <dcaratti@redhat.com> Link: https://lore.kernel.org/r/13edef6778fef03adc751582562fba4a13e06d6a.1608240532.git.dcaratti@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
c41ea30c38
commit
3f2a28930a
|
@ -1626,7 +1626,7 @@ static void taprio_destroy(struct Qdisc *sch)
|
|||
taprio_disable_offload(dev, q, NULL);
|
||||
|
||||
if (q->qdiscs) {
|
||||
for (i = 0; i < dev->num_tx_queues && q->qdiscs[i]; i++)
|
||||
for (i = 0; i < dev->num_tx_queues; i++)
|
||||
qdisc_put(q->qdiscs[i]);
|
||||
|
||||
kfree(q->qdiscs);
|
||||
|
|
Loading…
Reference in New Issue