Commit a58b61e5 authored by David Miller's avatar David Miller Committed by David S. Miller

libcxgbi: Handle dst_get_neighbour_noref() returning NULL.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarRoland Dreier <roland@purestorage.com>
parent 3786cf18
...@@ -472,6 +472,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) ...@@ -472,6 +472,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
struct net_device *ndev; struct net_device *ndev;
struct cxgbi_device *cdev; struct cxgbi_device *cdev;
struct rtable *rt = NULL; struct rtable *rt = NULL;
struct neighbour *n;
struct flowi4 fl4; struct flowi4 fl4;
struct cxgbi_sock *csk = NULL; struct cxgbi_sock *csk = NULL;
unsigned int mtu = 0; unsigned int mtu = 0;
...@@ -493,7 +494,12 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) ...@@ -493,7 +494,12 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
goto err_out; goto err_out;
} }
dst = &rt->dst; dst = &rt->dst;
ndev = dst_get_neighbour_noref(dst)->dev; n = dst_get_neighbour_noref(dst);
if (!n) {
err = -ENODEV;
goto rel_rt;
}
ndev = n->dev;
if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) { if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) {
pr_info("multi-cast route %pI4, port %u, dev %s.\n", pr_info("multi-cast route %pI4, port %u, dev %s.\n",
...@@ -507,7 +513,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) ...@@ -507,7 +513,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr);
mtu = ndev->mtu; mtu = ndev->mtu;
pr_info("rt dev %s, loopback -> %s, mtu %u.\n", pr_info("rt dev %s, loopback -> %s, mtu %u.\n",
dst_get_neighbour_noref(dst)->dev->name, ndev->name, mtu); n->dev->name, ndev->name, mtu);
} }
cdev = cxgbi_device_find_by_netdev(ndev, &port); cdev = cxgbi_device_find_by_netdev(ndev, &port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment