RDMA/rxe: Fix memory leak in error path code
Subsystems (2)
PATCH v2 1/1 RDMA/rxe: Fix memory leak in error path code
In rxe_mr_init_user() in rxe_mr.c at the third error the driver fails to free the memory at mr->map. This patch adds code to do that. This error only occurs if page_address() fails to return a non zero address which should never happen for 64 bit architectures.
Reported by: Haakon Bugge <[email protected]>
---
v2:
Left out white space changes.
drivers/infiniband/sw/rxe/rxe_mr.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/infiniband/sw/rxe/rxe_mr.c +17 -10
@@ -113,13 +113,14 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,int num_buf;void *vaddr;int err; +int i; umem =ib_umem_get (pd->ibpd.device, start, length, access);if (IS_ERR (umem)) { -pr_warn ("err %d from rxe_umem_get\n" , - (int )PTR_ERR (umem)); +pr_warn ("%s: Unable to pin memory region err = %d\n" , + __func__, (int )PTR_ERR (umem)); err =PTR_ERR (umem); - goto err1; + goto err_out; } mr->umem = umem;
@@ -129,9 +130,9 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, err =rxe_mr_alloc (mr, num_buf);if (err) { -pr_warn ("err %d from rxe_mr_alloc\n" , err); -ib_umem_release (umem); - goto err1; +pr_warn ("%s: Unable to allocate memory for map\n" , + __func__); + goto err_release_umem; } mr->page_shift =PAGE_SHIFT ;
@@ -151,10 +152,10 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, vaddr =page_address (sg_page_iter_page (&sg_iter));if (!vaddr) { -pr_warn ("null vaddr\n" ); -ib_umem_release (umem); +pr_warn ("%s: Unable to get virtual address\n" , + __func__); err = -ENOMEM ; - goto err1; + goto err_cleanup_map; } buf->addr = (uintptr_t )vaddr;
@@ -177,7 +178,13 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,return 0 ; -err1: +err_cleanup_map: +for (i =0 ; i < mr->num_map; i++) +kfree (mr->map[i]); +kfree (mr->map); +err_release_umem: +ib_umem_release (umem); +err_out:return err; }
Signature · 1 line
2.30.2
Quoted 9 lines · Bob Pearson
In
rxe_mr_init_user()inrxe_mr.cat the third error the driver fails to free the memory atmr->map. This patch adds code to do that. This error only occurs ifpage_address()fails to return a non zero address which should never happen for 64 bit architectures.Fixes 8700e3e7c485 ("Soft RoCE driver")Reported by: Haakon Bugge <[email protected]>
Signed-off-by Bob Pearson <[email protected]>
Thanks a lot.
Zhu Yanjun
Quoted 12 lines
---
v2:
Left out white space changes.drivers/infiniband/sw/rxe/rxe_mr.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)drivers/infiniband/sw/rxe/rxe_mr.c +0
-0
drivers/infiniband/sw/rxe/rxe_mr.c int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, · line 116
Quoted 4 lines
drivers/infiniband/sw/rxe/rxe_mr.c +1
-0@@ -113,13 +113,14 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,int num_buf;void *vaddr;int err; +int i;
Thanks.
Quoted 58 lines
drivers/infiniband/sw/rxe/rxe_mr.c +16
-11umem =ib_umem_get (pd->ibpd.device, start, length, access);if (IS_ERR (umem)) { -pr_warn ("err %d from rxe_umem_get\n" , - (int )PTR_ERR (umem)); +pr_warn ("%s: Unable to pin memory region err = %d\n" , + __func__, (int )PTR_ERR (umem)); err =PTR_ERR (umem); - goto err1; + goto err_out; } mr->umem = umem;@@ -129,9 +130,9 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, err =rxe_mr_alloc (mr, num_buf);if (err) { -pr_warn ("err %d from rxe_mr_alloc\n" , err); -ib_umem_release (umem); - goto err1; +pr_warn ("%s: Unable to allocate memory for map\n" , + __func__); + goto err_release_umem; } mr->page_shift =PAGE_SHIFT ;@@ -151,10 +152,10 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, vaddr =page_address (sg_page_iter_page (&sg_iter));if (!vaddr) { -pr_warn ("null vaddr\n" ); -ib_umem_release (umem); +pr_warn ("%s: Unable to get virtual address\n" , + __func__); err = -ENOMEM ; - goto err1; + goto err_cleanup_map; } buf->addr = (uintptr_t )vaddr;@@ -177,7 +178,13 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,return 0 ; -err1: +err_cleanup_map: +for (i =0 ; i < mr->num_map; i++) +kfree (mr->map[i]); +kfree (mr->map); +err_release_umem: +ib_umem_release (umem); +err_out:return err; } --2.30.2
Haakon Bugge
Reviewed-byQuoted 11 lines · Zhu Yanjun
Quoted 6 lines · Bob Pearson
In
rxe_mr_init_user()inrxe_mr.cat the third error the driver fails to free the memory atmr->map. This patch adds code to do that. This error only occurs ifpage_address()fails to return a non zero address which should never happen for 64 bit architectures.
Quoted 7 lines
Quoted 3 lines
Fixes 8700e3e7c485 ("Soft RoCE driver")Reported by: Haakon Bugge <[email protected]>
Signed-off-by Bob Pearson <[email protected]>Thanks a lot.
Reviewed-by Zhu Yanjun <[email protected]>
Thxs, Håkon
Quoted 78 lines
Zhu Yanjun
Quoted 12 lines
---
v2:
Left out white space changes.
drivers/infiniband/sw/rxe/rxe_mr.c| 27 +++++++++++++++++----------1 file changed, 17 insertions(+), 10 deletions(-)drivers/infiniband/sw/rxe/rxe_mr.c +0
-0drivers/infiniband/sw/rxe/rxe_mr.c int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, · line 116
Quoted 4 lines
drivers/infiniband/sw/rxe/rxe_mr.c +1
-0@@ -113,13 +113,14 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,int num_buf;void *vaddr;int err; +int i;Thanks.
Quoted 57 lines
drivers/infiniband/sw/rxe/rxe_mr.c +16
-11umem =ib_umem_get (pd->ibpd.device, start, length, access);if (IS_ERR (umem)) { -pr_warn ("err %d from rxe_umem_get\n" , - (int )PTR_ERR (umem)); +pr_warn ("%s: Unable to pin memory region err = %d\n" , + __func__, (int )PTR_ERR (umem)); err =PTR_ERR (umem); - goto err1; + goto err_out; } mr->umem = umem;@@ -129,9 +130,9 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, err =rxe_mr_alloc (mr, num_buf);if (err) { -pr_warn ("err %d from rxe_mr_alloc\n" , err); -ib_umem_release (umem); - goto err1; +pr_warn ("%s: Unable to allocate memory for map\n" , + __func__); + goto err_release_umem; } mr->page_shift =PAGE_SHIFT ;@@ -151,10 +152,10 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, vaddr =page_address (sg_page_iter_page (&sg_iter));if (!vaddr) { -pr_warn ("null vaddr\n" ); -ib_umem_release (umem); +pr_warn ("%s: Unable to get virtual address\n" , + __func__); err = -ENOMEM ; - goto err1; + goto err_cleanup_map; } buf->addr = (uintptr_t )vaddr;@@ -177,7 +178,13 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,return 0 ; -err1: +err_cleanup_map: +for (i =0 ; i < mr->num_map; i++) +kfree (mr->map[i]); +kfree (mr->map); +err_release_umem: +ib_umem_release (umem); +err_out:return err; } --2.30.2
Quoted 5 lines · Bob Pearson
In
rxe_mr_init_user()inrxe_mr.cat the third error the driver fails to free the memory atmr->map. This patch adds code to do that. This error only occurs ifpage_address()fails to return a non zero address which should never happen for 64 bit architectures.
Quoted 8 lines
Fixes 8700e3e7c485 ("Soft RoCE driver")Reported by: Haakon Bugge <[email protected]>
Signed-off-by Bob Pearson <[email protected]>Reviewed-by Zhu Yanjun <[email protected]>Reviewed-by Håkon Bugge <[email protected]>---
v2:
Left out white space changes.
Applied to for-rc, thanks
Jason