From db13a768a07b31b4955db934f3d55d2c77335bcc Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sat, 17 Jun 2017 06:36:00 -0700 Subject: [PATCH] cmd: scsi: Fix null pointer dereference in 'scsi reset' During 'scsi reset', scsi_bus_reset() is called with udevice pointed to NULL, which causes exception. As a temporary fix, disable the call for DM SCSI for now. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- cmd/scsi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/scsi.c b/cmd/scsi.c index 570971891e..8e36de107e 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -36,7 +36,9 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) case 2: if (strncmp(argv[1], "res", 3) == 0) { printf("\nReset SCSI\n"); +#ifndef CONFIG_DM_SCSI scsi_bus_reset(NULL); +#endif ret = scsi_scan(true); if (ret) return CMD_RET_FAILURE; -- 2.39.5