svn commit: r209279 - stable/8/sys/geom/multipath

[Matt Jacob]

Author: mjacob
Date: Fri Jun 18 04:01:59 2010
New Revision: 209279
URL: http://svn.freebsd.org/changeset/base/209279

Log:
  This is an MFC of 208101
  
  Yet another potential dereference of a dead provider.

Modified:
  stable/8/sys/geom/multipath/g_multipath.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/geom/multipath/g_multipath.c
==============================================================================
--- stable/8/sys/geom/multipath/g_multipath.c	Fri Jun 18 03:59:07 2010	(r209278)
+++ stable/8/sys/geom/multipath/g_multipath.c	Fri Jun 18 04:01:59 2010	(r209279)
@@ -196,7 +196,7 @@ g_multipath_done_error(struct bio *bp)
 				break;
 			}
 		}
-		if (sc->cp_active == NULL) {
+		if (sc->cp_active == NULL || sc->cp_active->provider == NULL) {
 			printf("GEOM_MULTIPATH: out of providers for %s\n",
 			    sc->sc_name);
 			g_topology_unlock();