Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2012 04:55:06 +0000 (UTC)
From:      "Kenneth D. Merry" <ken@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r244016 - head/sys/cam/ctl
Message-ID:  <201212080455.qB84t6er067419@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ken
Date: Sat Dec  8 04:55:06 2012
New Revision: 244016
URL: http://svnweb.freebsd.org/changeset/base/244016

Log:
  Make sure we hold the SIM lock when calling xpt_free_path().
  
  Sponsored by:	Spectra Logic Corporation
  MFC after:	1 week

Modified:
  head/sys/cam/ctl/scsi_ctl.c

Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c	Sat Dec  8 04:16:07 2012	(r244015)
+++ head/sys/cam/ctl/scsi_ctl.c	Sat Dec  8 04:55:06 2012	(r244016)
@@ -1822,8 +1822,6 @@ ctlfe_onoffline(void *arg, int online)
 
 	xpt_action(ccb);
 
-	CAM_SIM_UNLOCK(sim);
-
 	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 		printf("%s: SIM %s (path id %d) target %s failed with "
 		       "status %#x\n",
@@ -1836,9 +1834,12 @@ ctlfe_onoffline(void *arg, int online)
 		       (online != 0) ? "enable" : "disable");
 	}
 
-	free(ccb, M_TEMP);
 	xpt_free_path(path);
 
+	CAM_SIM_UNLOCK(sim);
+
+	free(ccb, M_TEMP);
+
 	return;
 }
 
@@ -1920,10 +1921,10 @@ ctlfe_lun_enable(void *arg, struct ctl_i
 				  0,
 				  softc);
 
-	mtx_unlock(sim->mtx);
-
 	xpt_free_path(path);
 
+	mtx_unlock(sim->mtx);
+
 	return (0);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212080455.qB84t6er067419>