Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

cc3425cd · Jeff Kirsher · fc2ed77b · 94f826b8 · cc3425cd
Commit cc3425cd authored Mar 27, 2012 by Jeff Kirsher
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

net/ipv6/route.c net/ipv6/route.c +6 -2

No files found.
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2474,8 +2474,12 @@ static int rt6_fill_node(struct net *net,
 	rcu_read_lock();
 	n = dst_get_neighbour_noref(&rt->dst);
-	if (n)
+	if (n) {
-		NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);
+		if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {
+			rcu_read_unlock();
+			goto nla_put_failure;
+		}
+	}
 	rcu_read_unlock();
 	if (rt->dst.dev)