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

Commit de8d6e02 authored by Eli Cohen's avatar Eli Cohen Committed by Leon Romanovsky
Browse files

IB/mlx5: Fix kernel to user leak prevention logic 



The logic was broken as it failed to update the response length for
architectures with PAGE_SIZE larger than 4kB. As a result further
extension of the ucontext response struct would fail.

Fixes: d69e3bcf ('IB/mlx5: Mmap the HCA's core clock register to user-space')
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Reviewed-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 525dfa2c

drivers/infiniband/hw/mlx5/main.c

+7 −7
Original line number Diff line number Diff line
@@ -1148,13 +1148,13 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, 
	 * pretend we don't support reading the HCA's core clock. This is also

	 * forced by mmap function.

	 */

	if (PAGE_SIZE <= 4096 &&

	    field_avail(typeof(resp), hca_core_clock_offset, udata->outlen)) {

	if (field_avail(typeof(resp), hca_core_clock_offset, udata->outlen)) {

		if (PAGE_SIZE <= 4096) {

			resp.comp_mask |=

				MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_CORE_CLOCK_OFFSET;

			resp.hca_core_clock_offset =

			offsetof(struct mlx5_init_seg, internal_timer_h) %

			PAGE_SIZE;

				offsetof(struct mlx5_init_seg, internal_timer_h) % PAGE_SIZE;

		}

		resp.response_length += sizeof(resp.hca_core_clock_offset) +

					sizeof(resp.reserved2);

	}