| Message ID | 1528977459-52285-1-git-send-email-jiazhouyang09@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, Jun 14, 2018 at 2:57 PM, Zhouyang Jia <jiazhouyang09@gmail.com> wrote: > When pci_iomap fails, the lack of error-handling code may > cause unexpected results. What results? How had you tested it? > This patch adds error-handling code after calling pci_iomap. > + if (bfad->pci_bar2_kva == NULL) { > + printk(KERN_ERR "Fail to map bar2\n"); pr_err() ? > + goto out_unmap_bar0; > + }
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index bd7e6a6f..693e180 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -760,6 +760,11 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) goto out_release_region; } + if (bfad->pci_bar2_kva == NULL) { + printk(KERN_ERR "Fail to map bar2\n"); + goto out_unmap_bar0; + } + bfad->hal_pcidev.pci_slot = PCI_SLOT(pdev->devfn); bfad->hal_pcidev.pci_func = PCI_FUNC(pdev->devfn); bfad->hal_pcidev.pci_bar_kva = bfad->pci_bar0_kva; @@ -797,6 +802,8 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) return 0; +out_unmap_bar0: + pci_iounmap(pdev, bfad->pci_bar0_kva); out_release_region: pci_release_regions(pdev); out_disable_device:
When pci_iomap fails, the lack of error-handling code may cause unexpected results. This patch adds error-handling code after calling pci_iomap. Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com> --- v1->v2: - Unmap bfad->pci_bar0_kva. --- drivers/scsi/bfa/bfad.c | 7 +++++++ 1 file changed, 7 insertions(+)