Skip to content

Commit 7d984da

Browse files
zhijianli88jgunthorpe
authored andcommitted
RDMA/rxe: Fix mr->map double free
rxe_mr_cleanup() which tries to free mr->map again will be called when rxe_mr_init_user() fails: CPU: 0 PID: 4917 Comm: rdma_flush_serv Kdump: loaded Not tainted 6.1.0-rc1-roce-flush+ #25 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x45/0x5d panic+0x19e/0x349 end_report.part.0+0x54/0x7c kasan_report.cold+0xa/0xf rxe_mr_cleanup+0x9d/0xf0 [rdma_rxe] __rxe_cleanup+0x10a/0x1e0 [rdma_rxe] rxe_reg_user_mr+0xb7/0xd0 [rdma_rxe] ib_uverbs_reg_mr+0x26a/0x480 [ib_uverbs] ib_uverbs_handler_UVERBS_METHOD_INVOKE_WRITE+0x1a2/0x250 [ib_uverbs] ib_uverbs_cmd_verbs+0x1397/0x15a0 [ib_uverbs] This issue was firstly exposed since commit b18c7da ("RDMA/rxe: Fix memory leak in error path code") and then we fixed it in commit 8ff5f5d ("RDMA/rxe: Prevent double freeing rxe_map_set()") but this fix was reverted together at last by commit 1e75550 (Revert "RDMA/rxe: Create duplicate mapping tables for FMRs") Simply let rxe_mr_cleanup() always handle freeing the mr->map once it is successfully allocated. Fixes: 1e75550 ("Revert "RDMA/rxe: Create duplicate mapping tables for FMRs"") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Li Zhijian <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 8e1a764 commit 7d984da

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

drivers/infiniband/sw/rxe/rxe_mr.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ static int rxe_mr_alloc(struct rxe_mr *mr, int num_buf)
9797
kfree(mr->map[i]);
9898

9999
kfree(mr->map);
100+
mr->map = NULL;
100101
err1:
101102
return -ENOMEM;
102103
}
@@ -120,7 +121,6 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
120121
int num_buf;
121122
void *vaddr;
122123
int err;
123-
int i;
124124

125125
umem = ib_umem_get(&rxe->ib_dev, start, length, access);
126126
if (IS_ERR(umem)) {
@@ -159,9 +159,8 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
159159
if (!vaddr) {
160160
rxe_dbg_mr(mr, "Unable to get virtual address\n");
161161
err = -ENOMEM;
162-
goto err_cleanup_map;
162+
goto err_release_umem;
163163
}
164-
165164
buf->addr = (uintptr_t)vaddr;
166165
buf->size = PAGE_SIZE;
167166
num_buf++;
@@ -178,10 +177,6 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
178177

179178
return 0;
180179

181-
err_cleanup_map:
182-
for (i = 0; i < mr->num_map; i++)
183-
kfree(mr->map[i]);
184-
kfree(mr->map);
185180
err_release_umem:
186181
ib_umem_release(umem);
187182
err_out:

0 commit comments

Comments
 (0)