diff options
| author | John Soni Jose <sony.john-n@emulex.com> | 2015-04-25 08:17:45 +0530 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-05-25 08:46:32 -0700 |
| commit | eb1c46924dfb48489272e8dc561bed9693e143d4 (patch) | |
| tree | 692c82ebbeabc5f15a35a41d6e059a021b913f0a /drivers | |
| parent | 4e2bdf7a2b841422f207bb6d74819955e386a175 (diff) | |
| download | linux-stable-eb1c46924dfb48489272e8dc561bed9693e143d4.tar.gz linux-stable-eb1c46924dfb48489272e8dc561bed9693e143d4.tar.bz2 linux-stable-eb1c46924dfb48489272e8dc561bed9693e143d4.zip | |
be2iscsi : Fix memory check before unmapping.
Check DMA memory before it is unmapped.
Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 7212bb47c075..65108370bfef 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -1368,8 +1368,10 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn, if (io_task->cmd_bhs->iscsi_hdr.flags & ISCSI_FLAG_CMD_READ) conn->rxdata_octets += resid; unmap: - scsi_dma_unmap(io_task->scsi_cmnd); - io_task->scsi_cmnd = NULL; + if (io_task->scsi_cmnd) { + scsi_dma_unmap(io_task->scsi_cmnd); + io_task->scsi_cmnd = NULL; + } iscsi_complete_scsi_task(task, exp_cmdsn, max_cmdsn); } @@ -4609,11 +4611,13 @@ beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn, spin_unlock_bh(&phba->mgmt_sgl_lock); } - if (io_task->mtask_addr) + if (io_task->mtask_addr) { pci_unmap_single(phba->pcidev, io_task->mtask_addr, io_task->mtask_data_count, PCI_DMA_TODEVICE); + io_task->mtask_addr = 0; + } } /** |