d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two use-after-free cases.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2007-04-29 00:41:29 +00:00
parent 05f17943bb
commit f2c9356328
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
View File

@ -84,13 +84,13 @@ vdev_geom_orphan(struct g_consumer *cp)
ZFS_LOG(1, "Closing access to %s.", cp->provider->name);
g_access(cp, -cp->acr, -cp->acw, -cp->ace);
g_detach(cp);
ZFS_LOG(1, "Destroyed consumer to %s.", cp->provider->name);
g_detach(cp);
g_destroy_consumer(cp);
/* Destroy geom if there are no consumers left. */
if (LIST_EMPTY(&gp->consumer)) {
ZFS_LOG(1, "Destroyed geom %s.", gp->name);
g_wither_geom(cp->geom, error);
g_wither_geom(gp, error);
}
vdev_geom_release(vd);
/* Both methods below work, but in a bit different way. */

4
sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
View File

@ -84,13 +84,13 @@ vdev_geom_orphan(struct g_consumer *cp)
ZFS_LOG(1, "Closing access to %s.", cp->provider->name);
g_access(cp, -cp->acr, -cp->acw, -cp->ace);
g_detach(cp);
ZFS_LOG(1, "Destroyed consumer to %s.", cp->provider->name);
g_detach(cp);
g_destroy_consumer(cp);
/* Destroy geom if there are no consumers left. */
if (LIST_EMPTY(&gp->consumer)) {
ZFS_LOG(1, "Destroyed geom %s.", gp->name);
g_wither_geom(cp->geom, error);
g_wither_geom(gp, error);
}
vdev_geom_release(vd);
/* Both methods below work, but in a bit different way. */