Module Name: src
Committed By: nat
Date: Fri May 19 04:16:06 UTC 2017
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Fix locking botch. Ensure that sc_lock is still held when exiting
trigger_[input/output].
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/dev/usb/uaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.148 src/sys/dev/usb/uaudio.c:1.149
--- src/sys/dev/usb/uaudio.c:1.148 Tue May 16 23:49:43 2017
+++ src/sys/dev/usb/uaudio.c Fri May 19 04:16:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.148 2017/05/16 23:49:43 nat Exp $ */
+/* $NetBSD: uaudio.c,v 1.149 2017/05/19 04:16:06 nat Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.148 2017/05/16 23:49:43 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.149 2017/05/19 04:16:06 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2603,6 +2603,7 @@ uaudio_trigger_input(void *addr, void *s
mutex_exit(&sc->sc_lock);
err = uaudio_chan_open(sc, ch);
if (err) {
+ mutex_enter(&sc->sc_lock);
mutex_enter(&sc->sc_intr_lock);
return EIO;
}
@@ -2610,6 +2611,7 @@ uaudio_trigger_input(void *addr, void *s
err = uaudio_chan_alloc_buffers(sc, ch);
if (err) {
uaudio_chan_close(sc, ch);
+ mutex_enter(&sc->sc_lock);
mutex_enter(&sc->sc_intr_lock);
return EIO;
}
@@ -2655,6 +2657,7 @@ uaudio_trigger_output(void *addr, void *
mutex_exit(&sc->sc_lock);
err = uaudio_chan_open(sc, ch);
if (err) {
+ mutex_enter(&sc->sc_lock);
mutex_enter(&sc->sc_intr_lock);
return EIO;
}
@@ -2662,6 +2665,7 @@ uaudio_trigger_output(void *addr, void *
err = uaudio_chan_alloc_buffers(sc, ch);
if (err) {
uaudio_chan_close(sc, ch);
+ mutex_enter(&sc->sc_lock);
mutex_enter(&sc->sc_intr_lock);
return EIO;
}
