commit 1b34ec43c9b3de44a5420841ab293d1b2035a94c
author David S. Miller <davem@davemloft.net> Thu Mar 29 05:11:39 2012 -0400
committer David S. Miller <davem@davemloft.net> Sun Apr 01 18:11:37 2012 -0400
tree 8d6cf966c813e0e61001655179b5ef8e5f1b54b3
parent 9360ffd1859720f6520cf59241909b74dae369d0

pkt_sched: Stop using NLA_PUT*().

These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: David S. Miller <davem@davemloft.net>

net/sched/cls_basic.c

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index ea1f70b..590960a 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -257,8 +257,9 @@
 	if (nest == NULL)
 		goto nla_put_failure;
 
-	if (f->res.classid)
-		NLA_PUT_U32(skb, TCA_BASIC_CLASSID, f->res.classid);
+	if (f->res.classid &&
+	    nla_put_u32(skb, TCA_BASIC_CLASSID, f->res.classid))
+		goto nla_put_failure;
 
 	if (tcf_exts_dump(skb, &f->exts, &basic_ext_map) < 0 ||
 	    tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0)