diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-06-27 16:55:59 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-06-27 16:55:59 -0400 |
| commit | 8c32c4f2f7ff91152e09ce57a1bcb75596a71933 (patch) | |
| tree | c8d2b19f8153c343ac2a710c58cbaff269d94c6b /drivers/infiniband/sw | |
| parent | net/mlx4_en: Optimized single ring steering (diff) | |
| parent | rdma/cxgb4: Fix memory leaks during module exit (diff) | |
| download | linux-dev-8c32c4f2f7ff91152e09ce57a1bcb75596a71933.tar.xz linux-dev-8c32c4f2f7ff91152e09ce57a1bcb75596a71933.zip | |
Merge branch 'k.o/for-4.12-rc' into k.o/for-4.13-mlx-shared
Diffstat (limited to 'drivers/infiniband/sw')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_verbs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index 83d709e74dfb..073e66783f1d 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -740,13 +740,8 @@ static int init_send_wqe(struct rxe_qp *qp, struct ib_send_wr *ibwr, sge = ibwr->sg_list; for (i = 0; i < num_sge; i++, sge++) { - if (qp->is_user && copy_from_user(p, (__user void *) - (uintptr_t)sge->addr, sge->length)) - return -EFAULT; - - else if (!qp->is_user) - memcpy(p, (void *)(uintptr_t)sge->addr, - sge->length); + memcpy(p, (void *)(uintptr_t)sge->addr, + sge->length); p += sge->length; } |