RDMA/irdma: Fix double free related to rereg_user_mr
Subsystems (2)
PATCH 1/1 RDMA/irdma: Fix double free related to rereg_user_mr
If IB_MR_REREG_TRANS is set during rereg_user_mr, the umem will be released and a new one will be allocated in irdma_rereg_mr_trans. If any step of irdma_rereg_mr_trans fails after the new umem is allocated, it releases the umem, but does not set iwmr->region to NULL. The problem is that this failure is propagated to the user, who will then call ibv_dereg_mr (as they should). Then, the dereg_mr path will see a non-NULL umem and attempt to call ib_umem_release again.
Fix this by setting iwmr->region to NULL after ib_umem_release.
Fixed: 5ac388db27c4 ("RDMA/irdma: Add support to re-register a memory region")
--- drivers/infiniband/hw/irdma/verbs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/irdma/verbs.c +1 -0
@@ -3723,6 +3723,7 @@ static int irdma_rereg_mr_trans(struct irdma_mr *iwmr, u64 start, u64 len, err:ib_umem_release (region); + iwmr->region =NULL ;return err; }
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Leon Romanovsky
AppliedQuoted 10 lines · Jacob Moroni
If
IB_MR_REREG_TRANSis set duringrereg_user_mr, the umem will be released and a new one will be allocated inirdma_rereg_mr_trans. If any step ofirdma_rereg_mr_transfails after the new umem is allocated, it releases the umem, but does not setiwmr->regionto NULL. The problem is that this failure is propagated to the user, who will then callibv_dereg_mr(as they should). Then, thedereg_mrpath will see a non-NULL umem and attempt to callib_umem_releaseagain.[...]
Applied, thanks!
[1/1] RDMA/irdma: Fix double free related to rereg_user_mr
https://git.kernel.org/rdma/rdma/c/1b3b0ec3df4a69
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>