| Message ID | 20200823091453.4782-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort | expand |
On Sun, Aug 23, 2020 at 11:15 AM Dinghao Liu <dinghao.liu@zju.edu.cn> 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 <dinghao.liu@zju.edu.cn> Thanks! Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> > --- > 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 >
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
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;
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 <dinghao.liu@zju.edu.cn> --- drivers/scsi/pm8001/pm8001_sas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)