Skip to content

Commit f242539

Browse files
hdellergregkh
authored andcommitted
scsi: mptfusion: Fix null pointer dereferences in mptscsih_remove()
commit 2f4843b upstream. The mptscsih_remove() function triggers a kernel oops if the Scsi_Host pointer (ioc->sh) is NULL, as can be seen in this syslog: ioc0: LSI53C1030 B2: Capabilities={Initiator,Target} Begin: Waiting for root file system ... scsi host2: error handler thread failed to spawn, error = -4 mptspi: ioc0: WARNING - Unable to register controller with SCSI subsystem Backtrace: [<000000001045b7cc>] mptspi_probe+0x248/0x3d0 [mptspi] [<0000000040946470>] pci_device_probe+0x1ac/0x2d8 [<0000000040add668>] really_probe+0x1bc/0x988 [<0000000040ade704>] driver_probe_device+0x160/0x218 [<0000000040adee24>] device_driver_attach+0x160/0x188 [<0000000040adef90>] __driver_attach+0x144/0x320 [<0000000040ad7c78>] bus_for_each_dev+0xd4/0x158 [<0000000040adc138>] driver_attach+0x4c/0x80 [<0000000040adb3ec>] bus_add_driver+0x3e0/0x498 [<0000000040ae0130>] driver_register+0xf4/0x298 [<00000000409450c4>] __pci_register_driver+0x78/0xa8 [<000000000007d248>] mptspi_init+0x18c/0x1c4 [mptspi] This patch adds the necessary NULL-pointer checks. Successfully tested on a HP C8000 parisc workstation with buggy SCSI drives. Link: https://lore.kernel.org/r/20201022090005.GA9000@ls3530.fritz.box Cc: <stable@vger.kernel.org> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e1043d8 commit f242539

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

drivers/message/fusion/mptscsih.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,10 @@ mptscsih_remove(struct pci_dev *pdev)
11761176
MPT_SCSI_HOST *hd;
11771177
int sz1;
11781178

1179-
if((hd = shost_priv(host)) == NULL)
1180-
return;
1179+
if (host == NULL)
1180+
hd = NULL;
1181+
else
1182+
hd = shost_priv(host);
11811183

11821184
mptscsih_shutdown(pdev);
11831185

@@ -1193,14 +1195,15 @@ mptscsih_remove(struct pci_dev *pdev)
11931195
"Free'd ScsiLookup (%d) memory\n",
11941196
ioc->name, sz1));
11951197

1196-
kfree(hd->info_kbuf);
1198+
if (hd)
1199+
kfree(hd->info_kbuf);
11971200

11981201
/* NULL the Scsi_Host pointer
11991202
*/
12001203
ioc->sh = NULL;
12011204

1202-
scsi_host_put(host);
1203-
1205+
if (host)
1206+
scsi_host_put(host);
12041207
mpt_detach(pdev);
12051208

12061209
}

0 commit comments

Comments
 (0)