From: Jarek Poplawski Date: Fri, 6 Aug 2010 00:22:35 +0000 (+0000) Subject: pkt_sched: Fix sch_sfq vs tcf_bind_filter oops X-Git-Tag: v2.6.34.6~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30b50aef739011ff91deb1e5e4e3e9dbc2b01be2;p=thirdparty%2Fkernel%2Fstable.git pkt_sched: Fix sch_sfq vs tcf_bind_filter oops [ Upstream commit eb4a5527b1f0d581ac217c80ef3278ed5e38693c ] Since there was added ->tcf_chain() method without ->bind_tcf() to sch_sfq class options, there is oops when a filter is added with the classid parameter. Fixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998 netdev thread: null pointer at cls_api.c Signed-off-by: Jarek Poplawski Reported-by: Franchoze Eric Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index c5a9ac5660079..9616570b74bcc 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -502,6 +502,12 @@ static unsigned long sfq_get(struct Qdisc *sch, u32 classid) return 0; } +static unsigned long sfq_bind(struct Qdisc *sch, unsigned long parent, + u32 classid) +{ + return 0; +} + static struct tcf_proto **sfq_find_tcf(struct Qdisc *sch, unsigned long cl) { struct sfq_sched_data *q = qdisc_priv(sch); @@ -556,6 +562,7 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg) static const struct Qdisc_class_ops sfq_class_ops = { .get = sfq_get, .tcf_chain = sfq_find_tcf, + .bind_tcf = sfq_bind, .dump = sfq_dump_class, .dump_stats = sfq_dump_class_stats, .walk = sfq_walk,