From 1430c69ae59435c6f85be8d41f49677f007a3d4d Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 30 Nov 2015 21:16:26 +0000 Subject: MFC r291383: Fix panic when trying to sort unsupported command in OOA queue. Handle unsupported commands as not conflicting/blocking. --- sys/cam/ctl/ctl.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/cam') diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index eedcfa9..24e7e89 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -11093,6 +11093,8 @@ ctl_check_for_blockage(struct ctl_lun *lun, union ctl_io *pending_io, __func__, pending_entry->seridx, pending_io->scsiio.cdb[0], pending_io->scsiio.cdb[1], pending_io)); ooa_entry = ctl_get_cmd_entry(&ooa_io->scsiio, NULL); + if (ooa_entry->seridx == CTL_SERIDX_INVLD) + return (CTL_ACTION_PASS); /* Unsupported command in OOA queue */ KASSERT(ooa_entry->seridx < CTL_SERIDX_COUNT, ("%s: Invalid seridx %d for ooa CDB %02x %02x @ %p", __func__, ooa_entry->seridx, ooa_io->scsiio.cdb[0], -- cgit v1.1