OSDN Git Service

snic: Fix use-after-free in case of a dma mapping error
authorJohannes Thumshirn <jthumshirn@suse.de>
Thu, 23 Jun 2016 12:37:20 +0000 (14:37 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 13 Jul 2016 03:16:31 +0000 (23:16 -0400)
If there is a dma mapping error snic kfree()s buf right before printing
it.  Change the order to not accidently trip on memory that's not owned
by us anymore.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Acked-by: Narsimhulu Musini <nmusini@cisco.com>
Reviewed-by: Laurence Oberman <loberman@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/snic/snic_disc.c

index b0fefd6..b106596 100644 (file)
@@ -113,11 +113,11 @@ snic_queue_report_tgt_req(struct snic *snic)
 
        pa = pci_map_single(snic->pdev, buf, buf_len, PCI_DMA_FROMDEVICE);
        if (pci_dma_mapping_error(snic->pdev, pa)) {
-               kfree(buf);
-               snic_req_free(snic, rqi);
                SNIC_HOST_ERR(snic->shost,
                              "Rpt-tgt rspbuf %p: PCI DMA Mapping Failed\n",
                              buf);
+               kfree(buf);
+               snic_req_free(snic, rqi);
                ret = -EINVAL;
 
                goto error;