diff options
| author | hannken <hannken@NetBSD.org> | 2013-02-06 09:29:46 +0000 |
|---|---|---|
| committer | hannken <hannken@NetBSD.org> | 2013-02-06 09:29:46 +0000 |
| commit | eb6fd7129892ec8f55e02b95c486e1f18c3a1ef3 (patch) | |
| tree | 06ad75a3f175e4f80866a7f26c05a3564fb77d9b /sys/dev/fss.c | |
| parent | 6e032d76ef1888a354fad3473f2f1b0630475c87 (diff) | |
Take fss_device_lock first when closing a fss device.
Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl)
Diffstat (limited to 'sys/dev/fss.c')
| -rw-r--r-- | sys/dev/fss.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/fss.c b/sys/dev/fss.c index 80a9d1863f8..1f11675794d 100644 --- a/sys/dev/fss.c +++ b/sys/dev/fss.c @@ -1,4 +1,4 @@ -/* $NetBSD: fss.c,v 1.83 2012/07/28 16:14:17 hannken Exp $ */ +/* $NetBSD: fss.c,v 1.84 2013/02/06 09:29:46 hannken Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.83 2012/07/28 16:14:17 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.84 2013/02/06 09:29:46 hannken Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -223,11 +223,13 @@ fss_close(dev_t dev, int flags, int mode, struct lwp *l) mflag = (mode == S_IFCHR ? FSS_CDEV_OPEN : FSS_BDEV_OPEN); error = 0; + mutex_enter(&fss_device_lock); restart: mutex_enter(&sc->sc_slock); if ((sc->sc_flags & (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) != mflag) { sc->sc_flags &= ~mflag; mutex_exit(&sc->sc_slock); + mutex_exit(&fss_device_lock); return 0; } if ((sc->sc_flags & FSS_ACTIVE) != 0 && @@ -239,12 +241,9 @@ restart: } if ((sc->sc_flags & FSS_ACTIVE) != 0) { mutex_exit(&sc->sc_slock); + mutex_exit(&fss_device_lock); return error; } - if (! mutex_tryenter(&fss_device_lock)) { - mutex_exit(&sc->sc_slock); - goto restart; - } KASSERT((sc->sc_flags & FSS_ACTIVE) == 0); KASSERT((sc->sc_flags & (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) == mflag); |
