diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-21 17:06:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-21 17:06:42 -0700 |
| commit | e2a7c34fb2856fd5306e307e170e3dde358d0dce (patch) | |
| tree | afeb300b04186b1a1f649b2cd8a401a75878297c /net/ipv4/route.c | |
| parent | 7d3f0cd43feea1636dd7746f22fe8249b34d1b79 (diff) | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 872b4cb136d3..94d4cd2d5ea4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1267,7 +1267,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst) if (mtu) return mtu; - mtu = dst->dev->mtu; + mtu = READ_ONCE(dst->dev->mtu); if (unlikely(dst_metric_locked(dst, RTAX_MTU))) { if (rt->rt_uses_gateway && mtu > 576) @@ -2769,14 +2769,21 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, if (rtm->rtm_flags & RTM_F_LOOKUP_TABLE) table_id = rt->rt_table_id; - if (rtm->rtm_flags & RTM_F_FIB_MATCH) + if (rtm->rtm_flags & RTM_F_FIB_MATCH) { + if (!res.fi) { + err = fib_props[res.type].error; + if (!err) + err = -EHOSTUNREACH; + goto errout_free; + } err = fib_dump_info(skb, NETLINK_CB(in_skb).portid, nlh->nlmsg_seq, RTM_NEWROUTE, table_id, rt->rt_type, res.prefix, res.prefixlen, fl4.flowi4_tos, res.fi, 0); - else + } else { err = rt_fill_info(net, dst, src, table_id, &fl4, skb, NETLINK_CB(in_skb).portid, nlh->nlmsg_seq); + } if (err < 0) goto errout_free; |