diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
| commit | 6dd7abae7110da6fa01f048baf5b679b5a4a56dd (patch) | |
| tree | 17ca298bbae17f05bdadae7f88e3be0f113a713f /drivers/infiniband/core | |
| parent | IB/cma: Destination and source addr families must match (diff) | |
| parent | RDMA: Don't reference kernel private header from UAPI header (diff) | |
| download | linux-dev-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.tar.xz linux-dev-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.zip | |
Merge branch 'k.o/for-4.10-rc' into HEAD
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 3 | ||||
| -rw-r--r-- | drivers/infiniband/core/umem.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index ba60e4b5114c..dab2a96ea032 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2851,7 +2851,8 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, if (!src_addr || !src_addr->sa_family) { src_addr = (struct sockaddr *) &id->route.addr.src_addr; src_addr->sa_family = dst_addr->sa_family; - if (dst_addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_IPV6) && + dst_addr->sa_family == AF_INET6) { struct sockaddr_in6 *src_addr6 = (struct sockaddr_in6 *) src_addr; struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *) dst_addr; src_addr6->sin6_scope_id = dst_addr6->sin6_scope_id; diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 1e62a5f0cb28..4609b921f899 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -134,6 +134,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, IB_ACCESS_REMOTE_ATOMIC | IB_ACCESS_MW_BIND)); if (access & IB_ACCESS_ON_DEMAND) { + put_pid(umem->pid); ret = ib_umem_odp_get(context, umem); if (ret) { kfree(umem); @@ -149,6 +150,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, page_list = (struct page **) __get_free_page(GFP_KERNEL); if (!page_list) { + put_pid(umem->pid); kfree(umem); return ERR_PTR(-ENOMEM); } |