Author: mav
Date: Tue Aug 27 16:41:06 2019
New Revision: 351550
URL: https://svnweb.freebsd.org/changeset/base/351550
Log:
Always check cam_periph_error() status for ERESTART.
Even if we do not expect retries, we better be sure, since otherwise it
may result in use after free kernel panic. I've noticed that it retries
SCSI_STATUS_BUSY even with SF_NO_RECOVERY | SF_NO_RETRY.
MFC after: 1 week
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- head/sys/cam/scsi/scsi_xpt.c Tue Aug 27 15:42:08 2019
(r351549)
+++ head/sys/cam/scsi/scsi_xpt.c Tue Aug 27 16:41:06 2019
(r351550)
@@ -1684,8 +1684,9 @@ probe_device_check:
case PROBE_TUR_FOR_NEGOTIATION:
case PROBE_DV_EXIT:
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
- cam_periph_error(done_ccb, 0,
- SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY);
+ if (cam_periph_error(done_ccb, 0, SF_NO_PRINT |
+ SF_NO_RECOVERY | SF_NO_RETRY) == ERESTART)
+ goto outr;
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1735,8 +1736,9 @@ probe_device_check:
struct ccb_scsiio *csio;
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
- cam_periph_error(done_ccb, 0,
- SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY);
+ if (cam_periph_error(done_ccb, 0, SF_NO_PRINT |
+ SF_NO_RECOVERY | SF_NO_RETRY) == ERESTART)
+ goto outr;
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
