Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09abfe7b authored by Roland Dreier's avatar Roland Dreier Committed by Doug Ledford
Browse files

RDMA/ucma: Allow resolving address w/o specifying source address 



The RDMA CM will select a source device and address by consulting
the routing table if no source address is passed into
rdma_resolve_address().  Userspace will ask for this by passing an
all-zero source address in the RESOLVE_IP command.  Unfortunately
the new check for non-zero address size rejects this with EINVAL,
which breaks valid userspace applications.

Fix this by explicitly allowing a zero address family for the source.

Fixes: 2975d5de ("RDMA/ucma: Check AF family prior resolving address")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 8b77586b

drivers/infiniband/core/ucma.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static ssize_t ucma_resolve_ip(struct ucma_file *file, 
	if (copy_from_user(&cmd, inbuf, sizeof(cmd)))

		return -EFAULT;



	if (!rdma_addr_size_in6(&cmd.src_addr) ||

	if ((cmd.src_addr.sin6_family && !rdma_addr_size_in6(&cmd.src_addr)) ||

	    !rdma_addr_size_in6(&cmd.dst_addr))

		return -EINVAL;