2020-10-01 07:28:51

by Gioh Kim

Subject: [PATCH 2/2] RDMA/rtrs: check before free

From: Gioh Kim <[email protected]>

If rtrs_iu_alloc failed to allocate buffer or map dma,
there are some allocated addresses and some NULL addresses
in the array. rtrs_iu_free should check data before free.

Signed-off-by: Gioh Kim <[email protected]>
---
drivers/infiniband/ulp/rtrs/rtrs.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
index 5163e662f86f..ca2d2d3e4192 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs.c
@@ -61,8 +61,12 @@ void rtrs_iu_free(struct rtrs_iu *ius, struct ib_device *ibdev, u32 queue_size)

for (i = 0; i < queue_size; i++) {
iu = &ius[i];
- ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, iu->direction);
- kfree(iu->buf);
+ if (iu->dma_addr) {
+ ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, iu->direction);
+ }
+ if (iu->buf) {
+ kfree(iu->buf);
+ }
}
kfree(ius);
}
--
2.20.1

2020-10-01 09:47:08

by Jinpu Wang

Subject: Re: [PATCH 2/2] RDMA/rtrs: check before free

On Thu, Oct 1, 2020 at 9:27 AM Gioh Kim <[email protected]> wrote:
>
> From: Gioh Kim <[email protected]>
>
> If rtrs_iu_alloc failed to allocate buffer or map dma,
> there are some allocated addresses and some NULL addresses
> in the array. rtrs_iu_free should check data before free.
>
> Signed-off-by: Gioh Kim <[email protected]>
> ---
> drivers/infiniband/ulp/rtrs/rtrs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
> index 5163e662f86f..ca2d2d3e4192 100644
> --- a/drivers/infiniband/ulp/rtrs/rtrs.c
> +++ b/drivers/infiniband/ulp/rtrs/rtrs.c
> @@ -61,8 +61,12 @@ void rtrs_iu_free(struct rtrs_iu *ius, struct ib_device *ibdev, u32 queue_size)
>
> for (i = 0; i < queue_size; i++) {
> iu = &ius[i];
> - ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, iu->direction);
> - kfree(iu->buf);
> + if (iu->dma_addr) {
> + ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, iu->direction);
> + }
No need for bracket
> + if (iu->buf) {
> + kfree(iu->buf);
> + }
kfree checks NULL already.
> }
> kfree(ius);
> }
> --
> 2.20.1
>