diff mbox

lpfc: avoid double free of resource identifiers

Message ID 20170111100642.18573-1-jthumshirn@suse.de (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Johannes Thumshirn Jan. 11, 2017, 10:06 a.m. UTC 
From: Roberto Sassu <rsassu@suse.de>

Set variables initialized in lpfc_sli4_alloc_resource_identifiers() to NULL
if an error occurred. Otherwise, lpfc_sli4_driver_resource_unset() attempts
to free the memory again.

Signed-off-by: Roberto Sassu <rsassu@suse.de>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 drivers/scsi/lpfc/lpfc_sli.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

James Smart Jan. 11, 2017, 7:47 p.m. UTC | #1 
looks good. Thanks

Signed-off-by: James Smart <james.smart@broadcom.com>

-- james


On 1/11/2017 2:06 AM, Johannes Thumshirn wrote:
> From: Roberto Sassu <rsassu@suse.de>
>
> Set variables initialized in lpfc_sli4_alloc_resource_identifiers() to NULL
> if an error occurred. Otherwise, lpfc_sli4_driver_resource_unset() attempts
> to free the memory again.
>
> Signed-off-by: Roberto Sassu <rsassu@suse.de>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>   drivers/scsi/lpfc/lpfc_sli.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> index 4faa767..a78a3df 100644
> --- a/drivers/scsi/lpfc/lpfc_sli.c
> +++ b/drivers/scsi/lpfc/lpfc_sli.c
> @@ -5954,18 +5954,25 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
>   
>    free_vfi_bmask:
>   	kfree(phba->sli4_hba.vfi_bmask);
> +	phba->sli4_hba.vfi_bmask = NULL;
>    free_xri_ids:
>   	kfree(phba->sli4_hba.xri_ids);
> +	phba->sli4_hba.xri_ids = NULL;
>    free_xri_bmask:
>   	kfree(phba->sli4_hba.xri_bmask);
> +	phba->sli4_hba.xri_bmask = NULL;
>    free_vpi_ids:
>   	kfree(phba->vpi_ids);
> +	phba->vpi_ids = NULL;
>    free_vpi_bmask:
>   	kfree(phba->vpi_bmask);
> +	phba->vpi_bmask = NULL;
>    free_rpi_ids:
>   	kfree(phba->sli4_hba.rpi_ids);
> +	phba->sli4_hba.rpi_ids = NULL;
>    free_rpi_bmask:
>   	kfree(phba->sli4_hba.rpi_bmask);
> +	phba->sli4_hba.rpi_bmask = NULL;
>    err_exit:
>   	return rc;
>   }

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Martin K. Petersen Jan. 12, 2017, 3:57 a.m. UTC | #2 
>>>>> "Johannes" == Johannes Thumshirn <jthumshirn@suse.de> writes:

Johannes> Set variables initialized in
Johannes> lpfc_sli4_alloc_resource_identifiers() to NULL if an error
Johannes> occurred. Otherwise, lpfc_sli4_driver_resource_unset()
Johannes> attempts to free the memory again.

Applied to 4.10/scsi-fixes.
diff mbox

Patch

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 4faa767..a78a3df 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -5954,18 +5954,25 @@  lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
 
  free_vfi_bmask:
 	kfree(phba->sli4_hba.vfi_bmask);
+	phba->sli4_hba.vfi_bmask = NULL;
  free_xri_ids:
 	kfree(phba->sli4_hba.xri_ids);
+	phba->sli4_hba.xri_ids = NULL;
  free_xri_bmask:
 	kfree(phba->sli4_hba.xri_bmask);
+	phba->sli4_hba.xri_bmask = NULL;
  free_vpi_ids:
 	kfree(phba->vpi_ids);
+	phba->vpi_ids = NULL;
  free_vpi_bmask:
 	kfree(phba->vpi_bmask);
+	phba->vpi_bmask = NULL;
  free_rpi_ids:
 	kfree(phba->sli4_hba.rpi_ids);
+	phba->sli4_hba.rpi_ids = NULL;
  free_rpi_bmask:
 	kfree(phba->sli4_hba.rpi_bmask);
+	phba->sli4_hba.rpi_bmask = NULL;
  err_exit:
 	return rc;
 }