From 78762c05c4d1834620c8e3c6787d063d483fcf8f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 22 Aug 2006 22:20:14 -0700
Subject: [PATCH] --- yaml --- r: 34538 b: refs/heads/master c:
 a57d27fc7107ddcc655ba2812cfebfce3163fd62 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 03d3eec481a6..97c166cd012c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2809486424df58043b380aeb9d7f402c031c46f6
+refs/heads/master: a57d27fc7107ddcc655ba2812cfebfce3163fd62
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index eeff0b23e944..8f225499e32e 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -202,8 +202,10 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics)
 		}
 	}
 
-	if (!valid)
-		goto nla_put_failure;
+	if (!valid) {
+		nla_nest_cancel(skb, mx);
+		return 0;
+	}
 
 	return nla_nest_end(skb, mx);