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

Commit 5a371cf8 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

IB/mlx4: Fix mlx4_ib_alloc_mr error flow 



ibmr.device is being set only after ib_alloc_mr() is successfully complete.
Therefore, in case imlx4_mr_enable() returns with error, the error flow
unwinder calls to mlx4_free_priv_pages(), which uses ibmr.device.

Such usage causes to NULL dereference oops and to fix it, the IB device
should be set in the mr struct earlier stage (e.g. prior to calling
mlx4_free_priv_pages()).

Fixes: 1b2cd0fc ("IB/mlx4: Support the new memory registration API")
Signed-off-by: default avatarNitzan Carmi <nitzanc@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 45e6ae7e

drivers/infiniband/hw/mlx4/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd, 
		goto err_free_mr;



	mr->max_pages = max_num_sg;



	err = mlx4_mr_enable(dev->dev, &mr->mmr);

	if (err)

		goto err_free_pl;
@@ -653,6 +652,7 @@ struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd, 
	return &mr->ibmr;



err_free_pl:

	mr->ibmr.device = pd->device;

	mlx4_free_priv_pages(mr);

err_free_mr:

	(void) mlx4_mr_free(dev->dev, &mr->mmr);