svn commit: r297268 - head/sys/dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Fri Mar 25 16:01:40 2016
New Revision: 297268
URL: https://svnweb.freebsd.org/changeset/base/297268

Log:
  Fix iSCSI initiator crash that could happen with out-of-memory
  conditions with in-flight IO and subsequent reconnection.
  
  PR:		199117
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D5673

Modified:
  head/sys/dev/iscsi/iscsi.c

Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c	Fri Mar 25 08:26:37 2016	(r297267)
+++ head/sys/dev/iscsi/iscsi.c	Fri Mar 25 16:01:40 2016	(r297268)
@@ -2222,6 +2222,7 @@ iscsi_action_scsiio(struct iscsi_session
 
 		error = icl_pdu_append_data(request, csio->data_ptr, len, M_NOWAIT);
 		if (error != 0) {
+			iscsi_outstanding_remove(is, io);
 			icl_pdu_free(request);
 			if ((ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
 				xpt_freeze_devq(ccb->ccb_h.path, 1);