From 7eee2d50a1762666b7128a760903ae1577e5fca6 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Thu, 12 Jul 2012 03:39:11 +0000
Subject: [PATCH] --- yaml --- r: 312022 b: refs/heads/master c:
 7ac2908e4b2edaec60e9090ddb4d9ceb76c05e7d h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_sfb.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f5f66653d0d..9aa98e0fd8cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1f5163de417dab01fa9daaf09a74bbb19303f3c
+refs/heads/master: 7ac2908e4b2edaec60e9090ddb4d9ceb76c05e7d
diff --git a/trunk/net/sched/sch_sfb.c b/trunk/net/sched/sch_sfb.c
index 74305c883bd3..30ea4674cabd 100644
--- a/trunk/net/sched/sch_sfb.c
+++ b/trunk/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;
 	if (nla_put(skb, TCA_SFB_PARMS, sizeof(opt), &opt))
 		goto nla_put_failure;
 	return nla_nest_end(skb, opts);