Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/davem/net
git-mirror · Mar 28, 2012 · cc3425c · cc3425c
2 parents fc2ed77 + 94f826b
commit cc3425c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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)
-		NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);
+	if (n) {
+		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)