Author: mav
Date: Wed Mar 29 15:41:14 2017
New Revision: 316144
URL: https://svnweb.freebsd.org/changeset/base/316144
Log:
MFC r315303: Fix panic when SIM dereferenced before allocation.
Modified:
stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c Wed Mar 29 15:40:45 2017
(r316143)
+++ stable/10/sys/dev/isp/isp_freebsd.c Wed Mar 29 15:41:14 2017
(r316144)
@@ -362,39 +362,40 @@ isp_detach(ispsoftc_t *isp)
static void
isp_freeze_loopdown(ispsoftc_t *isp, int chan)
{
- if (IS_FC(isp)) {
- struct isp_fc *fc = ISP_FC_PC(isp, chan);
- if (fc->simqfrozen == 0) {
- isp_prt(isp, ISP_LOGDEBUG0,
- "Chan %d Freeze simq (loopdown)", chan);
- fc->simqfrozen = SIMQFRZ_LOOPDOWN;
- xpt_hold_boot();
- xpt_freeze_simq(fc->sim, 1);
- } else {
- isp_prt(isp, ISP_LOGDEBUG0,
- "Chan %d Mark simq frozen (loopdown)", chan);
- fc->simqfrozen |= SIMQFRZ_LOOPDOWN;
- }
+ struct isp_fc *fc = ISP_FC_PC(isp, chan);
+
+ if (fc->sim == NULL)
+ return;
+ if (fc->simqfrozen == 0) {
+ isp_prt(isp, ISP_LOGDEBUG0,
+ "Chan %d Freeze simq (loopdown)", chan);
+ fc->simqfrozen = SIMQFRZ_LOOPDOWN;
+ xpt_hold_boot();
+ xpt_freeze_simq(fc->sim, 1);
+ } else {
+ isp_prt(isp, ISP_LOGDEBUG0,
+ "Chan %d Mark simq frozen (loopdown)", chan);
+ fc->simqfrozen |= SIMQFRZ_LOOPDOWN;
}
}
static void
isp_unfreeze_loopdown(ispsoftc_t *isp, int chan)
{
- if (IS_FC(isp)) {
- struct isp_fc *fc = ISP_FC_PC(isp, chan);
- int wasfrozen = fc->simqfrozen & SIMQFRZ_LOOPDOWN;
- fc->simqfrozen &= ~SIMQFRZ_LOOPDOWN;
- if (wasfrozen && fc->simqfrozen == 0) {
- isp_prt(isp, ISP_LOGDEBUG0,
- "Chan %d Release simq", chan);
- xpt_release_simq(fc->sim, 1);
- xpt_release_boot();
- }
+ struct isp_fc *fc = ISP_FC_PC(isp, chan);
+
+ if (fc->sim == NULL)
+ return;
+ int wasfrozen = fc->simqfrozen & SIMQFRZ_LOOPDOWN;
+ fc->simqfrozen &= ~SIMQFRZ_LOOPDOWN;
+ if (wasfrozen && fc->simqfrozen == 0) {
+ isp_prt(isp, ISP_LOGDEBUG0,
+ "Chan %d Release simq", chan);
+ xpt_release_simq(fc->sim, 1);
+ xpt_release_boot();
}
}
-
static int
ispioctl(struct cdev *dev, u_long c, caddr_t addr, int flags, struct thread
*td)
{
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
