---

yaml --- r: 34538 b: refs/heads/master c: a57d27f h: refs/heads/master v: v3
git-mirror · Sep 22, 2006 · 78762c0 · 78762c0
1 parent 234c6ef
commit 78762c0
Show file tree

Hide file tree

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