aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-11 23:39:11 -0400
committerLuis Henriques <luis.henriques@canonical.com>2012-08-13 09:10:37 -0400
commit68a9d8cd671a94c4d7e0288729fe0c285c6afd48 (patch)
tree96e6ca45b273ee74f723e6498ea8bfd268b7783a /net
parentf0cf58569d6e24162bd31e28080df53ad6da8b6d (diff)
sch_sfb: Fix missing NULL check
BugLink: http://bugs.launchpad.net/bugs/1034988 [ Upstream commit 7ac2908e4b2edaec60e9090ddb4d9ceb76c05e7d ] Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44461 Signed-off-by: Alan Cox <alan@linux.intel.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_sfb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index 47ee29fad35..e85b248773e 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -556,6 +556,8 @@ static int sfb_dump(struct Qdisc *sch, struct sk_buff *skb)
556 556
557 sch->qstats.backlog = q->qdisc->qstats.backlog; 557 sch->qstats.backlog = q->qdisc->qstats.backlog;
558 opts = nla_nest_start(skb, TCA_OPTIONS); 558 opts = nla_nest_start(skb, TCA_OPTIONS);
559 if (opts == NULL)
560 goto nla_put_failure;
559 NLA_PUT(skb, TCA_SFB_PARMS, sizeof(opt), &opt); 561 NLA_PUT(skb, TCA_SFB_PARMS, sizeof(opt), &opt);
560 return nla_nest_end(skb, opts); 562 return nla_nest_end(skb, opts);
561 563