From 49ad3529ad9f1c1f1e8ae41370f94d4096a25718 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 1 Apr 2012 20:15:14 -0400
Subject: [PATCH] --- yaml --- r: 300404 b: refs/heads/master c:
 b21dddb9dfe50ca1e205faf4b25900895494d25b h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/net/decnet/dn_dev.c   | 14 +++++++-------
 trunk/net/decnet/dn_rules.c | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 92961c29b53d..857b7e58b381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24c410dce335dba6ad9f1abab833fa4cd32f7f7f
+refs/heads/master: b21dddb9dfe50ca1e205faf4b25900895494d25b
diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c
index 74d321a60e7b..16efcda2f060 100644
--- a/trunk/net/decnet/dn_dev.c
+++ b/trunk/net/decnet/dn_dev.c
@@ -695,13 +695,13 @@ static int dn_nl_fill_ifaddr(struct sk_buff *skb, struct dn_ifaddr *ifa,
 	ifm->ifa_scope = ifa->ifa_scope;
 	ifm->ifa_index = ifa->ifa_dev->dev->ifindex;
 
-	if (ifa->ifa_address)
-		NLA_PUT_LE16(skb, IFA_ADDRESS, ifa->ifa_address);
-	if (ifa->ifa_local)
-		NLA_PUT_LE16(skb, IFA_LOCAL, ifa->ifa_local);
-	if (ifa->ifa_label[0])
-		NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);
-
+	if ((ifa->ifa_address &&
+	     nla_put_le16(skb, IFA_ADDRESS, ifa->ifa_address)) ||
+	    (ifa->ifa_local &&
+	     nla_put_le16(skb, IFA_LOCAL, ifa->ifa_local)) ||
+	    (ifa->ifa_label[0] &&
+	     nla_put_string(skb, IFA_LABEL, ifa->ifa_label)))
+		goto nla_put_failure;
 	return nlmsg_end(skb, nlh);
 
 nla_put_failure:
diff --git a/trunk/net/decnet/dn_rules.c b/trunk/net/decnet/dn_rules.c
index f65c9ddaee41..7399e3d51922 100644
--- a/trunk/net/decnet/dn_rules.c
+++ b/trunk/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: