This is a note to let you know that I've just added the patch titled
ALSA: timer - Fix Oops at closing slave timer
to the 2.6.33-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.33.git;a=summary
The filename of the patch is:
alsa-timer-fix-oops-at-closing-slave-timer.patch
and it can be found in the queue-2.6.33 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.33 longterm
tree,
please let <sta...@kernel.org> know about it.
>From 0584ffa548b6e59aceb027112f23a55f0133400e Mon Sep 17 00:00:00 2001
From: Takashi Iwai <ti...@suse.de>
Date: Mon, 8 Aug 2011 12:24:46 +0200
Subject: ALSA: timer - Fix Oops at closing slave timer
From: Takashi Iwai <ti...@suse.de>
commit 0584ffa548b6e59aceb027112f23a55f0133400e upstream.
A slave-timer instance has no timer reference, and this results in
NULL-dereference at stopping the timer, typically called at closing
the device.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=40682
Signed-off-by: Takashi Iwai <ti...@suse.de>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
sound/core/timer.c | 2 ++
1 file changed, 2 insertions(+)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -530,6 +530,8 @@ int snd_timer_stop(struct snd_timer_inst
if (err < 0)
return err;
timer = timeri->timer;
+ if (!timer)
+ return -EINVAL;
spin_lock_irqsave(&timer->lock, flags);
timeri->cticks = timeri->ticks;
timeri->pticks = 0;
Patches currently in longterm-queue-2.6.33 which might be from ti...@suse.de are
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/alsa-timer-fix-oops-at-closing-slave-timer.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/alsa-snd-usb-caiaq-fix-keymap-for-rigkontrol3.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
