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[60/91] pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

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


    From: Jarek Poplawski <jarkao2@gmail.com>

    [ 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 <jarkao2@gmail.com>
    Reported-by: Franchoze Eric <franchoze@yandex.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/sched/sch_sfq.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/net/sched/sch_sfq.c
    +++ b/net/sched/sch_sfq.c
    @@ -502,6 +502,12 @@ static unsigned long sfq_get(struct Qdis
    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,
    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,



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