Commit b33da556 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

mlx5: Avoid that mlx5_ib_sg_to_klms() overflows the klms[] array 



commit 99975cd4 upstream.

ib_map_mr_sg() can pass an SG-list to .map_mr_sg() that is larger
than what fits into a single MR. .map_mr_sg() must not attempt to
map more SG-list elements than what fits into a single MR.
Hence make sure that mlx5_ib_sg_to_klms() does not write outside
the MR klms[] array.

Fixes: b005d316 ("mlx5: Add arbitrary sg list support")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Leon Romanovsky <leonro@mellanox.com>
Cc: Israel Rukshin <israelr@mellanox.com>
Acked-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4404251

drivers/infiniband/hw/mlx5/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ mlx5_ib_sg_to_klms(struct mlx5_ib_mr *mr, 
	mr->ndescs = sg_nents;



	for_each_sg(sgl, sg, sg_nents, i) {

		if (unlikely(i > mr->max_descs))

		if (unlikely(i >= mr->max_descs))

			break;

		klms[i].va = cpu_to_be64(sg_dma_address(sg) + sg_offset);

		klms[i].bcount = cpu_to_be32(sg_dma_len(sg) - sg_offset);