From: Artemy Kovalyov Date: Tue, 14 Nov 2017 12:51:59 +0000 (+0200) Subject: IB/umem: Fix use of npages/nmap fields X-Git-Tag: v4.19~1637^2~248 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edf1a84fe37c51290e2c88154ecaf48dadff3d27;p=platform%2Fkernel%2Flinux-rpi.git IB/umem: Fix use of npages/nmap fields In ib_umem structure npages holds original number of sg entries, while nmap is number of DMA blocks returned by dma_map_sg. Fixes: c5d76f130b28 ('IB/core: Add umem function to read data from user-space') Signed-off-by: Artemy Kovalyov Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe --- diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 130606c..9a4e899 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -352,7 +352,7 @@ int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset, return -EINVAL; } - ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->nmap, dst, length, + ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->npages, dst, length, offset + ib_umem_offset(umem)); if (ret < 0)