diff options
| author | Nitzan Carmi <nitzanc@mellanox.com> | 2017-12-26 11:20:20 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-27 15:24:41 -0700 |
| commit | 45e6ae7ef21b907dacb18da62d5787d74a31d860 (patch) | |
| tree | dd45067d1c1a85ae3061f2f86c98b9f96469e8c4 /drivers/infiniband/hw/mlx5/mr.c | |
| parent | 4a50881bbac309e6f0684816a180bc3c14e1485d (diff) | |
| download | lwn-45e6ae7ef21b907dacb18da62d5787d74a31d860.tar.gz lwn-45e6ae7ef21b907dacb18da62d5787d74a31d860.zip | |
IB/mlx5: Fix mlx5_ib_alloc_mr error flow
ibmr.device is being set only after ib_alloc_mr() is
(successfully) complete. Therefore, in case mlx5_core_create_mkey()
return with error, the error flow calls mlx5_free_priv_descs()
which uses ibmr.device (which doesn't exist yet), causing
a NULL dereference oops.
To fix this, the IB device should be set in the mr struct earlier
stage (e.g. prior to calling mlx5_core_create_mkey()).
Fixes: 8a187ee52b04 ("IB/mlx5: Support the new memory registration API")
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Nitzan Carmi <nitzanc@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mr.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index ee0ee1f9994b..d109fe8290a7 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1637,6 +1637,7 @@ struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, MLX5_SET(mkc, mkc, access_mode, mr->access_mode); MLX5_SET(mkc, mkc, umr_en, 1); + mr->ibmr.device = pd->device; err = mlx5_core_create_mkey(dev->mdev, &mr->mmkey, in, inlen); if (err) goto err_destroy_psv; |