diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-28 01:29:26 (GMT) |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-28 01:29:26 (GMT) |
| commit | cc3425cdc04206f3c8b9efb2c693e89aa3cd9ec7 (patch) | |
| tree | bb9893bf45ef93842a315b5ed8287ae1f11ae41b | |
| parent | fc2ed77b9d6b579d61024163c74f41c24394fcc7 (diff) | |
| parent | 94f826b8076e2cb92242061e92f21b5baa3eccc2 (diff) | |
| download | linux-fsl-qoriq-cc3425cdc04206f3c8b9efb2c693e89aa3cd9ec7.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
| -rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 24c456e..496b627 100644 --- 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) |