2021-03-11 06:33:59

by Lv Yunlong

Subject: [PATCH] scsi: Fix a double free in myrs_cleanup

In myrs_cleanup, cs->mmio_base will be freed twice by
iounmap().

Fixes: 77266186397c6 ("scsi: myrs: Add Mylex RAID controller (SCSI interface)")
Signed-off-by: Lv Yunlong <[email protected]>
---
drivers/scsi/myrs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index 4adf9ded296a..329fd025c718 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -2273,12 +2273,12 @@ static void myrs_cleanup(struct myrs_hba *cs)
if (cs->mmio_base) {
cs->disable_intr(cs);
iounmap(cs->mmio_base);
+ cs->mmio_base = NULL;
}
if (cs->irq)
free_irq(cs->irq, cs);
if (cs->io_addr)
release_region(cs->io_addr, 0x80);
- iounmap(cs->mmio_base);
pci_set_drvdata(pdev, NULL);
pci_disable_device(pdev);
scsi_host_put(cs->host);
--
2.25.1

2021-03-11 10:46:29

by Hannes Reinecke

Subject: Re: [PATCH] scsi: Fix a double free in myrs_cleanup

On 3/11/21 7:30 AM, Lv Yunlong wrote:
> In myrs_cleanup, cs->mmio_base will be freed twice by
> iounmap().
>
> Fixes: 77266186397c6 ("scsi: myrs: Add Mylex RAID controller (SCSI interface)")
> Signed-off-by: Lv Yunlong <[email protected]>
> ---
> drivers/scsi/myrs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
> index 4adf9ded296a..329fd025c718 100644
> --- a/drivers/scsi/myrs.c
> +++ b/drivers/scsi/myrs.c
> @@ -2273,12 +2273,12 @@ static void myrs_cleanup(struct myrs_hba *cs)
> if (cs->mmio_base) {
> cs->disable_intr(cs);
> iounmap(cs->mmio_base);
> + cs->mmio_base = NULL;
> }
> if (cs->irq)
> free_irq(cs->irq, cs);
> if (cs->io_addr)
> release_region(cs->io_addr, 0x80);
> - iounmap(cs->mmio_base);
> pci_set_drvdata(pdev, NULL);
> pci_disable_device(pdev);
> scsi_host_put(cs->host);
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
[email protected] +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer

2021-03-16 11:26:03

by Martin K. Petersen

Subject: Re: [PATCH] scsi: Fix a double free in myrs_cleanup

On Wed, 10 Mar 2021 22:30:05 -0800, Lv Yunlong wrote:

> In myrs_cleanup, cs->mmio_base will be freed twice by
> iounmap().

Applied to 5.12/scsi-fixes, thanks!

[1/1] scsi: Fix a double free in myrs_cleanup
https://git.kernel.org/mkp/scsi/c/2bb817712e2f

--
Martin K. Petersen Oracle Linux Engineering