pkt_sched: Fix qdisc_create on stab error handling
Subsystems (3)
PATCH 1/1 pkt_sched: Fix qdisc_create on stab error handling
If qdisc_get_stab returns error in qdisc_create there is skipped qdisc ops->destroy, which is necessary because it's after ops->init at the moment, so memory leaks are quite probable.
Signed-off-by Jarek Poplawski <[email protected]>
---
net/sched/sch_api.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_api.c +2 -2
@@ -804,7 +804,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, stab =qdisc_get_stab (tca[TCA_STAB ]);if (IS_ERR (stab)) { err =PTR_ERR (stab); - goto err_out3; + goto err_out4; } sch->stab = stab; }
@@ -833,7 +833,6 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,return sch; } err_out3: -qdisc_put_stab (sch->stab);dev_put (dev);kfree ((char *) sch - sch->padded); err_out2:
@@ -847,6 +846,7 @@ err_out4:* Any broken qdiscs that would require a ops->reset() here? * The qdisc was never in action so it shouldn't be necessary. */ +qdisc_put_stab (sch->stab);if (ops->destroy) ops->destroy (sch); goto err_out3;
From: Jarek Poplawski <[email protected]>
Date: Tue, 15 Sep 2009 20:46:51 +0200
Quoted 5 lines
If
qdisc_get_stabreturns error inqdisc_createthere is skipped qdiscops->destroy, which is necessary because it's afterops->initat the moment, so memory leaks are quite probable.Signed-off-by Jarek Poplawski <[email protected]>
Applied, thanks a lot!