2009-07-13 21:25:56

by Jiri Slaby

Subject: [PATCH] SCSI: lpfc, don't dereference NULL

When kzalloc fails in lpfc_hba_alloc, don't dereference the NULL by
lpfc_printf_log. Use dev_err instead.

Signed-off-by: Jiri Slaby <[email protected]>
---
drivers/scsi/lpfc/lpfc_init.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index fc67cc6..2452dc9 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4130,8 +4130,7 @@ lpfc_hba_alloc(struct pci_dev *pdev)
/* Allocate memory for HBA structure */
phba = kzalloc(sizeof(struct lpfc_hba), GFP_KERNEL);
if (!phba) {
- lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
- "1417 Failed to allocate hba struct.\n");
+ dev_err(&pdev->dev, "failed to allocate hba struct\n");
return NULL;
}

--
1.6.3.2

2009-07-15 19:00:58

by James Smart

Subject: Re: [PATCH] SCSI: lpfc, don't dereference NULL

Thanks Jiri.

-- james s


Acked-By: James Smart <[email protected]>


Jiri Slaby wrote:
> When kzalloc fails in lpfc_hba_alloc, don't dereference the NULL by
> lpfc_printf_log. Use dev_err instead.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_init.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index fc67cc6..2452dc9 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -4130,8 +4130,7 @@ lpfc_hba_alloc(struct pci_dev *pdev)
> /* Allocate memory for HBA structure */
> phba = kzalloc(sizeof(struct lpfc_hba), GFP_KERNEL);
> if (!phba) {
> - lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
> - "1417 Failed to allocate hba struct.\n");
> + dev_err(&pdev->dev, "failed to allocate hba struct\n");
> return NULL;
> }
>