lkml.org 
[lkml]   [2010]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[070/114] pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    From: Jarek Poplawski <jarkao2@gmail.com>

    [ Upstream commit 41065fba846e795b31b17e4dec01cb904d56c6cd ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/sched/sch_sfq.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/net/sched/sch_sfq.c
    +++ b/net/sched/sch_sfq.c
    @@ -497,6 +497,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;
    @@ -560,6 +565,7 @@ static void sfq_walk(struct Qdisc *sch,
    }

    static const struct Qdisc_class_ops sfq_class_ops = {
    + .leaf = sfq_leaf,
    .get = sfq_get,
    .tcf_chain = sfq_find_tcf,
    .bind_tcf = sfq_bind,



    \
     
     \ /
      Last update: 2010-08-25 01:15    [W:0.033 / U:0.160 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site