diff mbox series

[4.19,10/49] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort

Message ID 20200921162035.126920567@linuxfoundation.org
State Superseded
Headers show
Series None | expand

Commit Message

gregkh@linuxfoundation.org Sept. 21, 2020, 4:27 p.m. UTC 
From: Dinghao Liu <dinghao.liu@zju.edu.cn>

[ Upstream commit ea403fde7552bd61bad6ea45e3feb99db77cb31e ]

When pm8001_tag_alloc() fails, task should be freed just like it is done in
the subsequent error paths.

Link: https://lore.kernel.org/r/20200823091453.4782-1-dinghao.liu@zju.edu.cn
Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/scsi/pm8001/pm8001_sas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pavel Machek Sept. 22, 2020, 3:29 p.m. UTC | #1 
Hi!

> From: Dinghao Liu <dinghao.liu@zju.edu.cn>
> 
> [ Upstream commit ea403fde7552bd61bad6ea45e3feb99db77cb31e ]
> 
> When pm8001_tag_alloc() fails, task should be freed just like it is done in
> the subsequent error paths.

Does the timer also need to be deleted, as in the next error return?
Or better, can we move tag_alloc before add_timer()? 

Best regards,

										Pavel

> diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
> index 5be4212312cb0..ba79b37d8cf7e 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.c
> +++ b/drivers/scsi/pm8001/pm8001_sas.c
> @@ -794,7 +794,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.25.1
> 
>
diff mbox series

Patch

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 5be4212312cb0..ba79b37d8cf7e 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -794,7 +794,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;