svn commit: r216612 - stable/7/sys/kern
Andrew Thompson
thompsa at FreeBSD.org
Tue Dec 21 09:33:06 UTC 2010
Author: thompsa
Date: Tue Dec 21 09:33:06 2010
New Revision: 216612
URL: http://svn.freebsd.org/changeset/base/216612
Log:
MFC r216371:
Fix race in devfs by using LIST_FIRST() instead of
LIST_FOREACH_SAFE() when freeing the devfs private
data entries.
Approved by: re (kib)
Modified:
stable/7/sys/kern/kern_conf.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/kern/kern_conf.c
==============================================================================
--- stable/7/sys/kern/kern_conf.c Tue Dec 21 09:31:48 2010 (r216611)
+++ stable/7/sys/kern/kern_conf.c Tue Dec 21 09:33:06 2010 (r216612)
@@ -863,7 +863,7 @@ static void
destroy_devl(struct cdev *dev)
{
struct cdevsw *csw;
- struct cdev_privdata *p, *p1;
+ struct cdev_privdata *p;
mtx_assert(&devmtx, MA_OWNED);
KASSERT(dev->si_flags & SI_NAMED,
@@ -908,7 +908,7 @@ destroy_devl(struct cdev *dev)
dev_unlock();
notify_destroy(dev);
mtx_lock(&cdevpriv_mtx);
- LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) {
+ while ((p = LIST_FIRST(&dev->si_priv->cdp_fdpriv)) != NULL) {
devfs_destroy_cdevpriv(p);
mtx_lock(&cdevpriv_mtx);
}
More information about the svn-src-stable-7
mailing list