diff options
| author |   Somnath Kotur <somnath.kotur@emulex.com> | 2013-11-16 09:30:01 +0530 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2014-01-22 22:49:17 -0800 |
| commit | 5462eddd7a78131ccb514d52473625d99769215e (patch) | |
| tree | 369a593837786ab8f5e437415057337bc602ed47 /drivers/infiniband/core/cma.c | |
| parent | Linux 3.13-rc8 (diff) | |
| download | linux-dev-5462eddd7a78131ccb514d52473625d99769215e.tar.xz linux-dev-5462eddd7a78131ccb514d52473625d99769215e.zip | |
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>
Diffstat (limited to 'drivers/infiniband/core/cma.c')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 8e49db690f33..4173a2ad6d08 100644 --- 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; |