From: Thomas Graf Date: Tue, 23 Aug 2005 17:12:44 +0000 (-0700) Subject: [PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt() X-Git-Tag: v2.6.13-rc7~55^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0fbbeb1ba43bd04f0f1d4f161b7f72437a1c8a03;p=linux-2.6-omap-h63xx.git [PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt() qdisc_create_dflt() is missing to destroy the newly allocated default qdisc if the initialization fails resulting in leaks of all kinds. The only caller in mainline which may trigger this bug is sch_tbf.c in tbf_create_dflt_qdisc(). Note: qdisc_create_dflt() doesn't fulfill the official locking requirements of qdisc_destroy() but since the qdisc could never be seen by the outside world this doesn't matter and it can stay as-is until the locking of pkt_sched is cleaned up. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller --- diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 8edefd5d095..0d066c96534 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -438,6 +438,7 @@ struct Qdisc * qdisc_create_dflt(struct net_device *dev, struct Qdisc_ops *ops) if (!ops->init || ops->init(sch, NULL) == 0) return sch; + qdisc_destroy(sch); errout: return NULL; }