diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-04-22 12:33:46 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-04-22 12:33:46 +0000 |
| commit | c0b4f8327478865383f033c4c5aafc4eb398c49f (patch) | |
| tree | e98b4dafe4e3af7c3eafe8d6b40605ac02440c2c /sys/dev/dkwedge/dk.c | |
| parent | 10eb819caca578fad2f394f93cd227def1b979b0 (diff) | |
dk(4): Fix racy access to sc->sc_dk.dk_openmask in dkwedge_delall1.
Need sc->sc_parent->dk_rawlock for this, as used in dkopen/dkclose.
Diffstat (limited to 'sys/dev/dkwedge/dk.c')
| -rw-r--r-- | sys/dev/dkwedge/dk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c index 0bab3019a2d..087f4f78730 100644 --- a/sys/dev/dkwedge/dk.c +++ b/sys/dev/dkwedge/dk.c @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.148 2023/04/21 18:54:09 riastradh Exp $ */ +/* $NetBSD: dk.c,v 1.149 2023/04/22 12:33:46 riastradh Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.148 2023/04/21 18:54:09 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.149 2023/04/22 12:33:46 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_dkwedge.h" @@ -796,6 +796,7 @@ dkwedge_delall1(struct disk *pdk, bool idleonly) flags |= DETACH_FORCE; for (;;) { + mutex_enter(&pdk->dk_rawlock); /* for sc->sc_dk.dk_openmask */ mutex_enter(&pdk->dk_openlock); LIST_FOREACH(sc, &pdk->dk_wedges, sc_plink) { if (!idleonly || sc->sc_dk.dk_openmask == 0) @@ -804,12 +805,14 @@ dkwedge_delall1(struct disk *pdk, bool idleonly) if (sc == NULL) { KASSERT(idleonly || pdk->dk_nwedges == 0); mutex_exit(&pdk->dk_openlock); + mutex_exit(&pdk->dk_rawlock); return; } strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent)); strlcpy(dkw.dkw_devname, device_xname(sc->sc_dev), sizeof(dkw.dkw_devname)); mutex_exit(&pdk->dk_openlock); + mutex_exit(&pdk->dk_rawlock); (void) dkwedge_del1(&dkw, flags); } } |
