Re: [PATCH 1/1] rdma: copy the saddr if it is already resolved

[Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

On Fri, 2017-06-09 at 16:19 +0530, Raju Rangoju wrote:
> The recent changes to addr6_resolve() to call ipv6 route lookup via
> the stub interface broke cxgb4/ipv6. If the source address is already
> resolved by ipv6_dst_lookup() then the check
> ipv6_addr_any(&fl6.saddr)
> would fail; consequently, copying saddr to the src_in buffer is
> omitted.
> 
> This commit addresses the above issue by moving the copy code out of
> the ipv6_addr_any() block in addr6_resolve().
> 
> Signed-off-by: Raju Rangoju <rajur-ut6Up61K2wZBDgjK7y7TUQ@public.gmane.org>
> ---
>  drivers/infiniband/core/addr.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/infiniband/core/addr.c
> b/drivers/infiniband/core/addr.c
> index 02971e239a18..c32477907765 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -454,11 +454,11 @@ static int addr6_resolve(struct sockaddr_in6
> *src_in,
>  					 &fl6.daddr, 0, &fl6.saddr);
>  		if (ret)
>  			goto put;
> -
> -		src_in->sin6_family = AF_INET6;
> -		src_in->sin6_addr = fl6.saddr;
>  	}
>  
> +	src_in->sin6_family = AF_INET6;
> +	src_in->sin6_addr = fl6.saddr;
> +
>  	/* If there's a gateway and type of device not
> ARPHRD_INFINIBAND, we're
>  	 * definitely in RoCE v2 (as RoCE v1 isn't routable) set the
> network
>  	 * type accordingly.

There was a different fix for this submitted by Roland Drier.  It has
been taken into my k.o/for-4.12-rc branch.  I need you to check that
his patch works for you and renders this patch no longer needed.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG KeyID: B826A3330E572FDD
   
Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html