diff options
| author | Mark Bloch <markb@mellanox.com> | 2016-10-27 16:36:29 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-11-16 20:03:44 -0500 |
| commit | 61c3702863be9e9f1ef12ed5a5b17bae6cdfac0b (patch) | |
| tree | fe6aa837a5642a25c3cfa070bcc638e043f40104 /drivers/infiniband | |
| parent | aeb76df46d1158d5f7f3d30f993a1bb6ee9c67a0 (diff) | |
| download | linux-stable-61c3702863be9e9f1ef12ed5a5b17bae6cdfac0b.tar.gz linux-stable-61c3702863be9e9f1ef12ed5a5b17bae6cdfac0b.tar.bz2 linux-stable-61c3702863be9e9f1ef12ed5a5b17bae6cdfac0b.zip | |
IB/core: Add missing check for addr_resolve callback return value
When calling rdma_resolve_ip inside rdma_addr_find_l2_eth_by_grh,
the return status of the request was ignored in the callback function
causing a successful return and an empty dmac.
Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Alex Vesker <valex@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/core/addr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index b136d3acc5bd..0f58f46dbad7 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -699,13 +699,16 @@ EXPORT_SYMBOL(rdma_addr_cancel); struct resolve_cb_context { struct rdma_dev_addr *addr; struct completion comp; + int status; }; static void resolve_cb(int status, struct sockaddr *src_addr, struct rdma_dev_addr *addr, void *context) { - memcpy(((struct resolve_cb_context *)context)->addr, addr, sizeof(struct - rdma_dev_addr)); + if (!status) + memcpy(((struct resolve_cb_context *)context)->addr, + addr, sizeof(struct rdma_dev_addr)); + ((struct resolve_cb_context *)context)->status = status; complete(&((struct resolve_cb_context *)context)->comp); } @@ -743,6 +746,10 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid, wait_for_completion(&ctx.comp); + ret = ctx.status; + if (ret) + return ret; + memcpy(dmac, dev_addr.dst_dev_addr, ETH_ALEN); dev = dev_get_by_index(&init_net, dev_addr.bound_dev_if); if (!dev) |