From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 8 Aug 2011 10:24:46 +0000 (+0200)
Subject: ALSA: timer - Fix Oops at closing slave timer
X-Git-Tag: v2.6.34.12~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b9e5abe55f28d4b104d398347e680f2b040e0ca;p=thirdparty%2Fkernel%2Fstable.git

ALSA: timer - Fix Oops at closing slave timer

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 <tiwai@suse.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 5040c7b862fe6..ecb2dd500a10e 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -530,6 +530,8 @@ int snd_timer_stop(struct snd_timer_instance *timeri)
 	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;