svn commit: r202418 - head/sys/dev/isp

Matt Jacob mjacob at FreeBSD.org
Fri Jan 15 20:08:08 UTC 2010


Author: mjacob
Date: Fri Jan 15 20:08:08 2010
New Revision: 202418
URL: http://svn.freebsd.org/changeset/base/202418

Log:
  Amazingly we've been freeing a handle and using that which it refers to
  for years. Bad!
  
  MFC after:	1 week

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

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c	Fri Jan 15 19:54:12 2010	(r202417)
+++ head/sys/dev/isp/isp.c	Fri Jan 15 20:08:08 2010	(r202418)
@@ -5185,7 +5185,6 @@ again:
 			ISP_WRITE(isp, isp->isp_respoutrp, optr);
 			continue;
 		}
-		isp_destroy_handle(isp, sp->req_handle);
 		if (req_status_flags & RQSTF_BUS_RESET) {
 			XS_SETERR(xs, HBA_BUSRESET);
 			ISP_SET_SENDMARKER(isp, XS_CHANNEL(xs), 1);
@@ -5321,6 +5320,7 @@ again:
 		if (XS_XFRLEN(xs)) {
 			ISP_DMAFREE(isp, xs, sp->req_handle);
 		}
+		isp_destroy_handle(isp, sp->req_handle);
 
 		if (((isp->isp_dblev & (ISP_LOGDEBUG1|ISP_LOGDEBUG2|ISP_LOGDEBUG3))) ||
 		    ((isp->isp_dblev & ISP_LOGDEBUG0) && ((!XS_NOERR(xs)) ||


More information about the svn-src-all mailing list