diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-09 10:59:15 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-09 10:59:15 -0800 |
| commit | 5edfa05a10a7a545f085b5bdf1a79567b4470d4e (patch) | |
| tree | 25ff2037a52d1220f269f4a3ecb0955caf451ea5 /net/ipv6/route.c | |
| parent | c8da41f0dc8d6cf25494b8462bf5875bda2e3568 (diff) | |
| parent | 6a1bd90632464c129ad5f9ca7c54917a6dd7cb4b (diff) | |
Merge tag 'v4.4.48' into android-4.4.y
This is the 4.4.48 stable release
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 3c5d6bb3b850..9ba4e350c6a9 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3188,7 +3188,8 @@ static int rt6_fill_node(struct net *net, if (nla_put_u8(skb, RTA_PREF, IPV6_EXTRACT_PREF(rt->rt6i_flags))) goto nla_put_failure; - lwtunnel_fill_encap(skb, rt->dst.lwtstate); + if (lwtunnel_fill_encap(skb, rt->dst.lwtstate) < 0) + goto nla_put_failure; nlmsg_end(skb, nlh); return 0; |