diff options
| author | David Miller <davem@davemloft.net> | 2011-12-02 16:52:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-05 15:20:20 -0500 |
| commit | a58b61e5b79bc9ce5f8d7b0cd03e8c6525c657f8 (patch) | |
| tree | 301eb7294127bdbad53d4f4947cf4119819e97c9 /drivers/scsi | |
| parent | 3786cf189f8b39cac870193368f9ad9f95fff9a4 (diff) | |
| download | op-kernel-dev-a58b61e5b79bc9ce5f8d7b0cd03e8c6525c657f8.zip op-kernel-dev-a58b61e5b79bc9ce5f8d7b0cd03e8c6525c657f8.tar.gz | |
libcxgbi: Handle dst_get_neighbour_noref() returning NULL.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index a026a2f..1d25a87 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -472,6 +472,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) struct net_device *ndev; struct cxgbi_device *cdev; struct rtable *rt = NULL; + struct neighbour *n; struct flowi4 fl4; struct cxgbi_sock *csk = NULL; unsigned int mtu = 0; @@ -493,7 +494,12 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) goto err_out; } 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)) { 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) ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); mtu = ndev->mtu; 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); |
