---

yaml --- r: 312022 b: refs/heads/master c: 7ac2908 h: refs/heads/master v: v3
git-mirror · Jul 12, 2012 · 7eee2d5 · 7eee2d5
1 parent 7f06b95
commit 7eee2d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);