xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: myrb: Fix up null pointer access on myrb_cleanup()

Browse Source 
[ Upstream commit f9f0a46141e2e39bedb4779c88380d1b5f018c14 ]

When myrb_probe() fails the callback might not be set, so we need to
validate the 'disable_intr' callback in myrb_cleanup() to not cause a null
pointer exception. And while at it do not call myrb_cleanup() if we cannot
enable the PCI device at all.

Link: https://lore.kernel.org/r/20220523120244.99515-1-hare@suse.de
Reported-by: Zheyu Ma <zheyuma97@gmail.com>
Tested-by: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hannes Reinecke
2022-05-23 14:02:44 +02:00
committed by Greg Kroah-Hartman
parent 7eb32f286e
commit ebfe279725
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/myrb.c
View File

@@ -1241,6 +1241,7 @@ static void myrb_cleanup(struct myrb_hba *cb)
myrb_unmap(cb); myrb_unmap(cb);
if (cb->mmio_base) { if (cb->mmio_base) {
if (cb->disable_intr)
cb->disable_intr(cb->io_base); cb->disable_intr(cb->io_base);
iounmap(cb->mmio_base); iounmap(cb->mmio_base);
} }
@@ -3515,9 +3516,13 @@ static struct myrb_hba *myrb_detect(struct pci_dev *pdev,
mutex_init(&cb->dcmd_mutex); mutex_init(&cb->dcmd_mutex);
mutex_init(&cb->dma_mutex); mutex_init(&cb->dma_mutex);
cb->pdev = pdev; cb->pdev = pdev;
cb->host = shost;
if (pci_enable_device(pdev)) if (pci_enable_device(pdev)) {
goto failure; dev_err(&pdev->dev, "Failed to enable PCI device\n");
scsi_host_put(shost);
return NULL;
}
if (privdata->hw_init == DAC960_PD_hw_init || if (privdata->hw_init == DAC960_PD_hw_init ||
privdata->hw_init == DAC960_P_hw_init) { privdata->hw_init == DAC960_P_hw_init) {