mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
IB/addr: Fix setting source address in addr6_resolve()
Commiteea40b8f62
("infiniband: call ipv6 route lookup via the stub interface") introduced a regression in address resolution when connecting to IPv6 destination addresses. The old code called ip6_route_output(), while the new code calls ipv6_stub->ipv6_dst_lookup(). The two are almost the same, except that ipv6_dst_lookup() also calls ip6_route_get_saddr() if the source address is in6addr_any. This means that the test of ipv6_addr_any(&fl6.saddr) now never succeeds, and so we never copy the source address out. This ends up causing rdma_resolve_addr() to fail, because without a resolved source address, cma_acquire_dev() will fail to find an RDMA device to use. For me, this causes connecting to an NVMe over Fabrics target via RoCE / IPv6 to fail. Fix this by copying out fl6.saddr if ipv6_addr_any() is true for the original source address passed into addr6_resolve(). We can drop our call to ipv6_dev_get_saddr() because ipv6_dst_lookup() already does that work. Fixes:eea40b8f62
("infiniband: call ipv6 route lookup via the stub interface") Cc: <stable@vger.kernel.org> # 3.12+ Signed-off-by: Roland Dreier <roland@purestorage.com> Acked-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
d3957b86a4
commit
79e2595940
1 changed files with 1 additions and 9 deletions
|
@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
rt = (struct rt6_info *)dst;
|
rt = (struct rt6_info *)dst;
|
||||||
if (ipv6_addr_any(&fl6.saddr)) {
|
if (ipv6_addr_any(&src_in->sin6_addr)) {
|
||||||
ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
|
|
||||||
&fl6.daddr, 0, &fl6.saddr);
|
|
||||||
if (ret)
|
|
||||||
goto put;
|
|
||||||
|
|
||||||
src_in->sin6_family = AF_INET6;
|
src_in->sin6_family = AF_INET6;
|
||||||
src_in->sin6_addr = fl6.saddr;
|
src_in->sin6_addr = fl6.saddr;
|
||||||
}
|
}
|
||||||
|
@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
|
||||||
|
|
||||||
*pdst = dst;
|
*pdst = dst;
|
||||||
return 0;
|
return 0;
|
||||||
put:
|
|
||||||
dst_release(dst);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static int addr6_resolve(struct sockaddr_in6 *src_in,
|
static int addr6_resolve(struct sockaddr_in6 *src_in,
|
||||||
|
|
Loading…
Reference in a new issue