Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1706440 > unrolled thread
| Started by | Pan Bian <bianpan2016@163.com> |
|---|---|
| First post | 2017-08-08 14:10 +0200 |
| Last post | 2017-08-11 02:10 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
scsi: mvsas: replace kfree with scsi_host_put Pan Bian <bianpan2016@163.com> - 2017-08-08 14:10 +0200
Re: scsi: mvsas: replace kfree with scsi_host_put Jinpu Wang <jinpu.wang@profitbricks.com> - 2017-08-08 16:50 +0200
Re: scsi: mvsas: replace kfree with scsi_host_put "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-08-11 02:10 +0200
| From | Pan Bian <bianpan2016@163.com> |
|---|---|
| Date | 2017-08-08 14:10 +0200 |
| Subject | scsi: mvsas: replace kfree with scsi_host_put |
| Message-ID | <ucbuG-8cT-17@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Jinpu Wang <jinpu.wang@profitbricks.com> |
|---|---|
| Date | 2017-08-08 16:50 +0200 |
| Message-ID | <ucdZw-1lD-9@gated-at.bofh.it> |
| In reply to | #1706440 |
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
[toc] | [prev] | [next] | [standalone]
| From | "Martin K. Petersen" <martin.petersen@oracle.com> |
|---|---|
| Date | 2017-08-11 02:10 +0200 |
| Message-ID | <ud5Gx-4IP-7@gated-at.bofh.it> |
| In reply to | #1706440 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web