From: Dan Carpenter <error27@gmail.com>
Date: Sun, 10 Oct 2010 17:33:52 +0000 (+0200)
Subject: OSS: soundcard: locking bug in sound_ioctl()
X-Git-Tag: v2.6.35.8~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c4cb1dd93619b45e8d0295bbcb83389195ce66fb;p=karo-tx-linux.git

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>
---

diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 2d9c51312622..19ce86d445c2 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;
 
 	}