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/sw/rxe/rxe_mr.c | |
| 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/sw/rxe/rxe_mr.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_mr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c index 8cf38b253c37..37eea7441ca4 100644 --- a/drivers/infiniband/sw/rxe/rxe_mr.c +++ b/drivers/infiniband/sw/rxe/rxe_mr.c @@ -59,9 +59,11 @@ int mem_check_range(struct rxe_mem *mem, u64 iova, size_t length) case RXE_MEM_TYPE_MR: case RXE_MEM_TYPE_FMR: - return ((iova < mem->iova) || - ((iova + length) > (mem->iova + mem->length))) ? - -EFAULT : 0; + if (iova < mem->iova || + length > mem->length || + iova > mem->iova + mem->length - length) + return -EFAULT; + return 0; default: return -EFAULT; |