From ced2f9c69fbf65c913ae2866eb63873fbc659ac4 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 31 May 2021 20:33:43 +0000 Subject: [PATCH] audio: Insert mixers and audioctls into sc_files on open too. This is necessary so that on detach we set file->dying before any operations, particularly audioclose, try to acquire a psref by the time the audio softc is gone. Candidate fix for PR kern/56164. --- sys/dev/audio/audio.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c index d09ed4ad663b..aa1f821f5f22 100644 --- a/sys/dev/audio/audio.c +++ b/sys/dev/audio/audio.c @@ -3633,7 +3633,11 @@ audioctl_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt, af->sc = sc; af->dev = dev; - /* Not necessary to insert sc_files. */ + mutex_enter(sc->sc_lock); + mutex_enter(sc->sc_intr_lock); + SLIST_INSERT_HEAD(&sc->sc_files, af, entry); + mutex_exit(sc->sc_intr_lock); + mutex_exit(sc->sc_lock); error = fd_clone(fp, fd, flags, &audio_fileops, af); KASSERTMSG(error == EMOVEFD, "error=%d", error); @@ -8281,6 +8285,12 @@ mixer_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt, af->sc = sc; af->dev = dev; + mutex_enter(sc->sc_lock); + mutex_enter(sc->sc_intr_lock); + SLIST_INSERT_HEAD(&sc->sc_files, af, entry); + mutex_exit(sc->sc_intr_lock); + mutex_exit(sc->sc_lock); + error = fd_clone(fp, fd, flags, &audio_fileops, af); KASSERT(error == EMOVEFD);