From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 8 Aug 2011 10:28:22 +0000 (+0200)
Subject: ALSA: timer - Add NULL-check for invalid slave timer
X-Git-Tag: v3.1-rc2~4^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94094c8aaeded11f8b99734b9ebdaada20b5f24a;p=platform%2Fkernel%2Flinux-stable.git

ALSA: timer - Add NULL-check for invalid slave timer

Just to be sure.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 950eed0..67ebf1c 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -328,6 +328,8 @@ int snd_timer_close(struct snd_timer_instance *timeri)
 		mutex_unlock(&register_mutex);
 	} else {
 		timer = timeri->timer;
+		if (snd_BUG_ON(!timer))
+			goto out;
 		/* wait, until the active callback is finished */
 		spin_lock_irq(&timer->lock);
 		while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) {
@@ -353,6 +355,7 @@ int snd_timer_close(struct snd_timer_instance *timeri)
 		}
 		mutex_unlock(&register_mutex);
 	}
+ out:
 	if (timeri->private_free)
 		timeri->private_free(timeri);
 	kfree(timeri->owner);