diff options
author | Dan Carpenter <error27@gmail.com> | 2010-10-10 13:33:52 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:44:17 -0400 |
commit | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (patch) | |
tree | 3c5fa5a8e2c29f7adfac3ed11c53d30b158c6220 /sound/oss/soundcard.c | |
parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) |
OSS: soundcard: locking bug in sound_ioctl()
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.
CC: stable@kernel.org
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/soundcard.c')
-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 92aa762ffb7e..07f803e6d203 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
@@ -391,11 +391,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
391 | case SND_DEV_DSP: | 391 | case SND_DEV_DSP: |
392 | case SND_DEV_DSP16: | 392 | case SND_DEV_DSP16: |
393 | case SND_DEV_AUDIO: | 393 | case SND_DEV_AUDIO: |
394 | return audio_ioctl(dev, file, cmd, p); | 394 | ret = audio_ioctl(dev, file, cmd, p); |
395 | break; | 395 | break; |
396 | 396 | ||
397 | case SND_DEV_MIDIN: | 397 | case SND_DEV_MIDIN: |
398 | return MIDIbuf_ioctl(dev, file, cmd, p); | 398 | ret = MIDIbuf_ioctl(dev, file, cmd, p); |
399 | break; | 399 | break; |
400 | 400 | ||
401 | } | 401 | } |