Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37c704e0 authored by Artemy Kovalyov's avatar Artemy Kovalyov Committed by Greg Kroah-Hartman
Browse files

IB/umem: Fix use of npages/nmap fields 




[ Upstream commit edf1a84fe37c51290e2c88154ecaf48dadff3d27 ]

In ib_umem structure npages holds original number of sg entries, while
nmap is number of DMA blocks returned by dma_map_sg.

Fixes: c5d76f13 ('IB/core: Add umem function to read data from user-space')
Signed-off-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 211a1e9f

drivers/infiniband/core/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,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)