> -----Original Message-----
> From: Bob Pearson <rpearsonhpe@xxxxxxxxx>
> Sent: Saturday, August 6, 2022 2:32 AM
> To: jgg@xxxxxxxxxx; zyjzyj2000@xxxxxxxxx; Li, Zhijian/李 智坚
> <lizhijian@xxxxxxxxxxx>; jhack@xxxxxxx; linux-rdma@xxxxxxxxxxxxxxx
> Cc: Bob Pearson <rpearsonhpe@xxxxxxxxx>
> Subject: [PATCH v5 for-next 2/2] RDMA/rxe: Test mr->umem before releasing
> umem
>
> In rxe_mr_cleanup() test mr->umem before calling ib_umem_release() since in
> some error paths it may not be set.
>
> Signed-off-by: Bob Pearson <rpearsonhpe@xxxxxxxxx>
> ---
> drivers/infiniband/sw/rxe/rxe_mr.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c
> b/drivers/infiniband/sw/rxe/rxe_mr.c
> index af34f198e645..f0726e8ee855 100644
> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> @@ -627,7 +627,9 @@ void rxe_mr_cleanup(struct rxe_pool_elem *elem)
> int i;
>
> rxe_put(mr_pd(mr));
> - ib_umem_release(mr->umem);
> +
> + if (mr->umem)
> + ib_umem_release(mr->umem);
It's safe to pass a NULL to ib_umem_release() where it has a such check.
Thanks
Zhijian
>
> if (mr->map) {
> for (i = 0; i < mr->num_map; i++)
> --
> 2.34.1
