summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-12 03:39:11 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:31:42 -0700
commitd5eeca5f5c19c472f8f221a81bb27f15a7aeed6c (patch)
tree4812210a3233ee1532376ffb3fc88191e94faa98 /net
parentaf8ca6ddbb2928d5fb26f0a78710971e1210a299 (diff)
downloadlinux-3.10-d5eeca5f5c19c472f8f221a81bb27f15a7aeed6c.tar.gz
linux-3.10-d5eeca5f5c19c472f8f221a81bb27f15a7aeed6c.tar.bz2
linux-3.10-d5eeca5f5c19c472f8f221a81bb27f15a7aeed6c.zip
sch_sfb: Fix missing NULL check
[ 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>
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 d7eea99333e..c6a5867d35c 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -570,6 +570,8 @@ static int sfb_dump(struct Qdisc *sch, struct sk_buff *skb)
sch->qstats.backlog = q->qdisc->qstats.backlog;
opts = nla_nest_start(skb, TCA_OPTIONS);
+ if (opts == NULL)
+ goto nla_put_failure;
NLA_PUT(skb, TCA_SFB_PARMS, sizeof(opt), &opt);
return nla_nest_end(skb, opts);