d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lock order reversal when opening device and chn_reset fails.

Browse Source 
Submitted by: Jan-Espen Pettersen <sigsegv@leakingmemory.org>
Tested by: Georg Funk <georgfunk@web.de>
This commit is contained in:
Orion Hodson 2003-05-01 16:31:21 +00:00
parent 8b3e7e90f2
commit 4f3204ef22
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=114432
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/sound/pcm/dsp.c
View File

@ -262,13 +262,12 @@ dsp_open(dev_t i_dev, int flags, int mode, struct thread *td)
i_dev->si_drv1 = rdch;
i_dev->si_drv2 = wrch;
pcm_unlock(d);
/* finished with snddev, new channels still locked */
/* bump refcounts, reset and unlock any channels that we just opened */
/* Bump refcounts, reset and unlock any channels that we just opened,
* and then release device lock.
*/
if (flags & FREAD) {
if (chn_reset(rdch, fmt)) {
pcm_lock(d);
pcm_chnrelease(rdch);
i_dev->si_drv1 = NULL;
if (wrch && (flags & FWRITE)) {
@ -286,7 +285,6 @@ dsp_open(dev_t i_dev, int flags, int mode, struct thread *td)
}
if (flags & FWRITE) {
if (chn_reset(wrch, fmt)) {
pcm_lock(d);
pcm_chnrelease(wrch);
i_dev->si_drv2 = NULL;
if (flags & FREAD) {
@ -304,6 +302,7 @@ dsp_open(dev_t i_dev, int flags, int mode, struct thread *td)
pcm_chnref(wrch, 1);
CHN_UNLOCK(wrch);
}
pcm_unlock(d);
splx(s);
return 0;
}