2020-08-23 09:18:33

by Dinghao Liu

[permalink] [raw]
Subject: [PATCH] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort

When pm8001_tag_alloc() fails, task should be freed just
like what we've done in the subsequent error paths.

Signed-off-by: Dinghao Liu <[email protected]>
---
drivers/scsi/pm8001/pm8001_sas.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 337e79d6837f..9889bab7d31c 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -818,7 +818,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,

res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);
if (res)
- return res;
+ goto ex_err;
ccb = &pm8001_ha->ccb_info[ccb_tag];
ccb->device = pm8001_dev;
ccb->ccb_tag = ccb_tag;
--
2.17.1


2020-08-31 06:17:28

by Jinpu Wang

[permalink] [raw]
Subject: Re: [PATCH] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort

On Sun, Aug 23, 2020 at 11:15 AM Dinghao Liu <[email protected]> wrote:
>
> When pm8001_tag_alloc() fails, task should be freed just
> like what we've done in the subsequent error paths.
>
> Signed-off-by: Dinghao Liu <[email protected]>
Thanks!
Acked-by: Jack Wang <[email protected]>
> ---
> drivers/scsi/pm8001/pm8001_sas.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
> index 337e79d6837f..9889bab7d31c 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.c
> +++ b/drivers/scsi/pm8001/pm8001_sas.c
> @@ -818,7 +818,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
>
> res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);
> if (res)
> - return res;
> + goto ex_err;
> ccb = &pm8001_ha->ccb_info[ccb_tag];
> ccb->device = pm8001_dev;
> ccb->ccb_tag = ccb_tag;
> --
> 2.17.1
>

2020-09-03 03:02:38

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort

On Sun, 23 Aug 2020 17:14:53 +0800, Dinghao Liu wrote:

> When pm8001_tag_alloc() fails, task should be freed just
> like what we've done in the subsequent error paths.

Applied to 5.9/scsi-fixes, thanks!

[1/1] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort
https://git.kernel.org/mkp/scsi/c/ea403fde7552

--
Martin K. Petersen Oracle Linux Engineering