From b21dddb9dfe50ca1e205faf4b25900895494d25b Mon Sep 17 00:00:00 2001 From: David S. Miller Date: Sun, 1 Apr 2012 20:15:14 -0400 Subject: decnet: 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 --- net/decnet/dn_rules.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'net/decnet/dn_rules.c') diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index f65c9ddaee41..7399e3d51922 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c @@ -204,11 +204,11 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb, frh->src_len = r->src_len; frh->tos = 0; - if (r->dst_len) - NLA_PUT_LE16(skb, FRA_DST, r->dst); - if (r->src_len) - NLA_PUT_LE16(skb, FRA_SRC, r->src); - + if ((r->dst_len && + nla_put_le16(skb, FRA_DST, r->dst)) || + (r->src_len && + nla_put_le16(skb, FRA_SRC, r->src))) + goto nla_put_failure; return 0; nla_put_failure: -- cgit v1.2.3-55-g7522