diff options
author | Shiraz Saleem <shiraz.saleem@intel.com> | 2019-03-28 12:49:47 -0400 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-03-28 13:13:27 -0400 |
commit | 629e6f9db6bf4c5702212dd77da534b838f14859 (patch) | |
tree | 08a734de3246990f57834390b7aed2a02d8e7719 | |
parent | 93923d309bda99bc52f8cee6ea4774895b18ae5b (diff) |
RDMA/rdmavt: Use correct sizing on buffers holding page DMA addresses
The buffer that holds the page DMA addresses is sized off umem->nmap.
This can potentially cause out of bound accesses on the PBL array when
iterating the umem DMA-mapped SGL. This is because if umem pages are
combined, umem->nmap can be much lower than the number of system pages
in umem.
Use ib_umem_num_pages() to size this buffer.
Cc: Dennis Dalessandro <dennis.dalessandro@intel.com>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r-- | drivers/infiniband/sw/rdmavt/mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c index 728795043496..e8b03ae54914 100644 --- a/drivers/infiniband/sw/rdmavt/mr.c +++ b/drivers/infiniband/sw/rdmavt/mr.c | |||
@@ -392,7 +392,7 @@ struct ib_mr *rvt_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, | |||
392 | if (IS_ERR(umem)) | 392 | if (IS_ERR(umem)) |
393 | return (void *)umem; | 393 | return (void *)umem; |
394 | 394 | ||
395 | n = umem->nmap; | 395 | n = ib_umem_num_pages(umem); |
396 | 396 | ||
397 | mr = __rvt_alloc_mr(n, pd); | 397 | mr = __rvt_alloc_mr(n, pd); |
398 | if (IS_ERR(mr)) { | 398 | if (IS_ERR(mr)) { |