diff options
author | Tomas Henzl <thenzl@redhat.com> | 2014-07-07 11:20:00 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-07-25 17:17:05 -0400 |
commit | 9422e864fa4e2d323407cfca6ca14712cf17fb40 (patch) | |
tree | 36d586eae9bed65156cd681bcd2e4bab59a6f2d7 | |
parent | da225498d97565b6f25ed28ebdf0fecdf3a5ca5c (diff) |
pm8001: fix a memory leak in flash_update
ccb->fw_control_context is copied to local fw_control_context and
the local variable is never used later
Free ccb->fw_control_context. The task is forgotten thus also the
reference to fw_control_context and the completion thread takes the info
from virt_ptr again.
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Suresh Thiagarajan <Suresh.Thiagarajan@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r-- | drivers/scsi/pm8001/pm8001_hwi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index cc89d18e1ae6..2e5eb4bae44f 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c | |||
@@ -3624,15 +3624,11 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha, | |||
3624 | void *piomb) | 3624 | void *piomb) |
3625 | { | 3625 | { |
3626 | u32 status; | 3626 | u32 status; |
3627 | struct fw_control_ex fw_control_context; | ||
3628 | struct fw_flash_Update_resp *ppayload = | 3627 | struct fw_flash_Update_resp *ppayload = |
3629 | (struct fw_flash_Update_resp *)(piomb + 4); | 3628 | (struct fw_flash_Update_resp *)(piomb + 4); |
3630 | u32 tag = le32_to_cpu(ppayload->tag); | 3629 | u32 tag = le32_to_cpu(ppayload->tag); |
3631 | struct pm8001_ccb_info *ccb = &pm8001_ha->ccb_info[tag]; | 3630 | struct pm8001_ccb_info *ccb = &pm8001_ha->ccb_info[tag]; |
3632 | status = le32_to_cpu(ppayload->status); | 3631 | status = le32_to_cpu(ppayload->status); |
3633 | memcpy(&fw_control_context, | ||
3634 | ccb->fw_control_context, | ||
3635 | sizeof(fw_control_context)); | ||
3636 | switch (status) { | 3632 | switch (status) { |
3637 | case FLASH_UPDATE_COMPLETE_PENDING_REBOOT: | 3633 | case FLASH_UPDATE_COMPLETE_PENDING_REBOOT: |
3638 | PM8001_MSG_DBG(pm8001_ha, | 3634 | PM8001_MSG_DBG(pm8001_ha, |
@@ -3675,11 +3671,11 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha, | |||
3675 | pm8001_printk("No matched status = %d\n", status)); | 3671 | pm8001_printk("No matched status = %d\n", status)); |
3676 | break; | 3672 | break; |
3677 | } | 3673 | } |
3678 | ccb->fw_control_context->fw_control->retcode = status; | 3674 | kfree(ccb->fw_control_context); |
3679 | complete(pm8001_ha->nvmd_completion); | ||
3680 | ccb->task = NULL; | 3675 | ccb->task = NULL; |
3681 | ccb->ccb_tag = 0xFFFFFFFF; | 3676 | ccb->ccb_tag = 0xFFFFFFFF; |
3682 | pm8001_tag_free(pm8001_ha, tag); | 3677 | pm8001_tag_free(pm8001_ha, tag); |
3678 | complete(pm8001_ha->nvmd_completion); | ||
3683 | return 0; | 3679 | return 0; |
3684 | } | 3680 | } |
3685 | 3681 | ||
@@ -4884,6 +4880,10 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha, | |||
4884 | break; | 4880 | break; |
4885 | } | 4881 | } |
4886 | rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &nvmd_req, 0); | 4882 | rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &nvmd_req, 0); |
4883 | if (rc) { | ||
4884 | kfree(fw_control_context); | ||
4885 | pm8001_tag_free(pm8001_ha, tag); | ||
4886 | } | ||
4887 | return rc; | 4887 | return rc; |
4888 | } | 4888 | } |
4889 | 4889 | ||