pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
authorJarek Poplawski <jarkao2@gmail.com>
Tue, 10 Aug 2010 22:31:02 +0000 (22:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Aug 2010 08:36:59 +0000 (01:36 -0700)
sch_sfq as a classful qdisc needs the .leaf handler. Otherwise, there
is an oops possible in tc_modify_qdisc()/check_loop().

Fixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_sfq.c

index b8bcb2096df8af43316b92843f83aeb1b67f5f13..201cbac2b32ce0ccd8375b066005b6ba69759ddd 100644 (file)
@@ -508,6 +508,11 @@ nla_put_failure:
        return -1;
 }
 
+static struct Qdisc *sfq_leaf(struct Qdisc *sch, unsigned long arg)
+{
+       return NULL;
+}
+
 static unsigned long sfq_get(struct Qdisc *sch, u32 classid)
 {
        return 0;
@@ -575,6 +580,7 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
 }
 
 static const struct Qdisc_class_ops sfq_class_ops = {
+       .leaf           =       sfq_leaf,
        .get            =       sfq_get,
        .put            =       sfq_put,
        .tcf_chain      =       sfq_find_tcf,