aboutsummaryrefslogtreecommitdiffstats
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:27:51 -0700
commit9b9f676623b92483d890d1a3a52611c09fc190f3 (patch)
treed7842fa93d7bcc10afcf7b2d825dd1dfe71ddcd0 /net
parent6577472957c45c35cedaa0e53748cb1c6c954e44 (diff)
downloadkernel_samsung_smdk4412-9b9f676623b92483d890d1a3a52611c09fc190f3.zip
kernel_samsung_smdk4412-9b9f676623b92483d890d1a3a52611c09fc190f3.tar.gz
kernel_samsung_smdk4412-9b9f676623b92483d890d1a3a52611c09fc190f3.tar.bz2
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 47ee29f..e85b2487 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)
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);