> From: Yotam Kenneth <yota...@mellanox.com> > > When accepting a new connection with the listener being IPv6, the > family of the new connection is set as IPv6. This causes cma_zero_addr > function to return true on an non-zero address. As a result, the wrong > code path is taken. This causes the connection request to be rejected, > as the RDMA-CM code looks for the wrong type of device. > > Since copying the ip address is done in different function depending > on the family (cma_save_ip4_info/cma_save_ip6_info) this is fixed by > hard coding the family of the IP address according to the function. > > Signed-off-by: Yotam Kenneth <yota...@mellanox.com> > Signed-off-by: Or Gerlitz <ogerl...@mellanox.com> > --- > drivers/infiniband/core/cma.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > index d570030..6e5e11c 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -866,12 +866,12 @@ static void cma_save_ip4_info(struct rdma_cm_id *id, > struct rdma_cm_id *listen_i > > listen4 = (struct sockaddr_in *) &listen_id->route.addr.src_addr; > ip4 = (struct sockaddr_in *) &id->route.addr.src_addr; > - ip4->sin_family = listen4->sin_family; > + ip4->sin_family = AF_INET; > ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr; > ip4->sin_port = listen4->sin_port; > > ip4 = (struct sockaddr_in *) &id->route.addr.dst_addr; > - ip4->sin_family = listen4->sin_family; > + ip4->sin_family = AF_INET; > ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr; > ip4->sin_port = hdr->port; > } > @@ -883,12 +883,12 @@ static void cma_save_ip6_info(struct rdma_cm_id *id, > struct rdma_cm_id *listen_i > > listen6 = (struct sockaddr_in6 *) &listen_id->route.addr.src_addr; > ip6 = (struct sockaddr_in6 *) &id->route.addr.src_addr; > - ip6->sin6_family = listen6->sin6_family; > + ip6->sin6_family = AF_INET6; > ip6->sin6_addr = hdr->dst_addr.ip6; > ip6->sin6_port = listen6->sin6_port; > > ip6 = (struct sockaddr_in6 *) &id->route.addr.dst_addr; > - ip6->sin6_family = listen6->sin6_family; > + ip6->sin6_family = AF_INET6; > ip6->sin6_addr = hdr->src_addr.ip6; > ip6->sin6_port = hdr->port;
I can't say that I understand what the problem is or how the change fixes it. Is listen4->sin_port above not AF_INET? If that's the case, then aren't we still taking the wrong code path and just masking some bug further up in the code path? -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
