diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-10-10 19:33:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 21:51:22 -0700 |
| commit | c4cb1dd93619b45e8d0295bbcb83389195ce66fb (patch) | |
| tree | 2db7452a48e857ada8ad468ddfbd0daad7af8892 /sound/oss | |
| parent | 84602dccfecbc66a791cdd1f2f32b4481ce67586 (diff) | |
OSS: soundcard: locking bug in sound_ioctl()
commit d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 upstream.
We shouldn't return directly here because we're still holding the
&soundcard_mutex.
This bug goes all the way back to the start of git. It's strange that
no one has complained about it as a runtime bug.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/soundcard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 2d9c5131262..19ce86d445c 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -389,11 +389,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case SND_DEV_DSP: case SND_DEV_DSP16: case SND_DEV_AUDIO: - return audio_ioctl(dev, file, cmd, p); + ret = audio_ioctl(dev, file, cmd, p); break; case SND_DEV_MIDIN: - return MIDIbuf_ioctl(dev, file, cmd, p); + ret = MIDIbuf_ioctl(dev, file, cmd, p); break; } |