RDMA/cma: Handle global/non-linklocal IPv6 addresses in cma_check_linklocal()

If addr is not a linklocal address, the code incorrectly fails to
return and ends up assigning the scope ID to the scope id of the
address, which is wrong.  Fix by checking if it's a link local address
first, and immediately return 0 if not.

Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 8e49db690f33e9a67f71cbcca8b62c9d92fde9f4..4173a2ad6d08c2b470e6886550066ec846e27d1e 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2480,8 +2480,11 @@ static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
                return 0;
 
        sin6 = (struct sockaddr_in6 *) addr;
-       if ((ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) &&
-           !sin6->sin6_scope_id)
+
+       if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL))
+               return 0;
+
+       if (!sin6->sin6_scope_id)
                        return -EINVAL;
 
        dev_addr->bound_dev_if = sin6->sin6_scope_id;