* scsi: mvsas: replace kfree with scsi_host_put
@ 2017-08-08 12:02 Pan Bian
2017-08-08 14:41 ` Jinpu Wang
2017-08-11 0:05 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Pan Bian @ 2017-08-08 12:02 UTC (permalink / raw)
To: James E.J. Bottomley, Martin K. Petersen, Johannes Thumshirn, Jinpu Wang
Cc: linux-scsi, linux-kernel, Pan Bian
The return value of scsi_host_alloc() should be released by
scsi_host_put(). However, in function mvs_pci_init(), kfree()
is used. This patch replaces kfree() with scsi_host_put() to avoid
possible memory leaks.
Signed-off-by: Pan Bian <bianpan2016@163.com>
---
drivers/scsi/mvsas/mv_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 4e047b5..75bdb38 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -557,14 +557,14 @@ static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent)
SHOST_TO_SAS_HA(shost) =
kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);
if (!SHOST_TO_SAS_HA(shost)) {
- kfree(shost);
+ scsi_host_put(shost);
rc = -ENOMEM;
goto err_out_regions;
}
rc = mvs_prep_sas_ha_init(shost, chip);
if (rc) {
- kfree(shost);
+ scsi_host_put(shost);
rc = -ENOMEM;
goto err_out_regions;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: scsi: mvsas: replace kfree with scsi_host_put
2017-08-08 12:02 scsi: mvsas: replace kfree with scsi_host_put Pan Bian
@ 2017-08-08 14:41 ` Jinpu Wang
2017-08-11 0:05 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Jinpu Wang @ 2017-08-08 14:41 UTC (permalink / raw)
To: Pan Bian
Cc: James E.J. Bottomley, Martin K. Petersen, Johannes Thumshirn,
Linux SCSI Mailinglist, linux-kernel
On Tue, Aug 8, 2017 at 2:02 PM, Pan Bian <bianpan2016@163.com> wrote:
> The return value of scsi_host_alloc() should be released by
> scsi_host_put(). However, in function mvs_pci_init(), kfree()
> is used. This patch replaces kfree() with scsi_host_put() to avoid
> possible memory leaks.
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
> drivers/scsi/mvsas/mv_init.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
> index 4e047b5..75bdb38 100644
> --- a/drivers/scsi/mvsas/mv_init.c
> +++ b/drivers/scsi/mvsas/mv_init.c
> @@ -557,14 +557,14 @@ static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent)
> SHOST_TO_SAS_HA(shost) =
> kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);
> if (!SHOST_TO_SAS_HA(shost)) {
> - kfree(shost);
> + scsi_host_put(shost);
> rc = -ENOMEM;
> goto err_out_regions;
> }
>
> rc = mvs_prep_sas_ha_init(shost, chip);
> if (rc) {
> - kfree(shost);
> + scsi_host_put(shost);
> rc = -ENOMEM;
> goto err_out_regions;
> }
> --
> 1.9.1
>
>
Looks good to me! Thanks Pan!
Reviewed-by: Jack Wang <jinpu.wang@profitbricks.com>
--
Jack Wang
Linux Kernel Developer
ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: scsi: mvsas: replace kfree with scsi_host_put
2017-08-08 12:02 scsi: mvsas: replace kfree with scsi_host_put Pan Bian
2017-08-08 14:41 ` Jinpu Wang
@ 2017-08-11 0:05 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2017-08-11 0:05 UTC (permalink / raw)
To: Pan Bian
Cc: James E.J. Bottomley, Martin K. Petersen, Johannes Thumshirn,
Jinpu Wang, linux-scsi, linux-kernel
Pan,
> The return value of scsi_host_alloc() should be released by
> scsi_host_put(). However, in function mvs_pci_init(), kfree()
> is used. This patch replaces kfree() with scsi_host_put() to avoid
> possible memory leaks.
Applied to 4.14/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-11 0:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-08 12:02 scsi: mvsas: replace kfree with scsi_host_put Pan Bian
2017-08-08 14:41 ` Jinpu Wang
2017-08-11 0:05 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).