[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20101022185231.302549809@clark.site>
Date: Fri, 22 Oct 2010 11:51:18 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Dan Carpenter <error27@...il.com>,
Arnd Bergmann <arnd@...db.de>, Takashi Iwai <tiwai@...e.de>
Subject: [044/103] OSS: soundcard: locking bug in sound_ioctl()
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <error27@...il.com>
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@...il.com>
Acked-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Takashi Iwai <tiwai@...e.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
sound/oss/soundcard.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -389,11 +389,11 @@ static long sound_ioctl(struct file *fil
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists