From: Kangjie Lu <kangjielu@gmail.com>
Date: Tue, 3 May 2016 20:44:32 +0000 (-0400)
Subject: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
X-Git-Tag: v3.2.82~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=370db426e5eb8b6823c0e8099616e91f21e3136c;hp=506a6ad7e521baf8e554eedfd09873f490c8a304

ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt

commit e4ec8cc8039a7063e24204299b462bd1383184a5 upstream.

The stack object “r1” has a total size of 32 bytes. Its field
“event” and “val” both contain 4 bytes padding. These 8 bytes
padding bytes are sent to user without being initialized.

Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 08a38befe109..bce3fe051fbf 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1248,6 +1248,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri,
 	}
 	if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) &&
 	    tu->last_resolution != resolution) {
+		memset(&r1, 0, sizeof(r1));
 		r1.event = SNDRV_TIMER_EVENT_RESOLUTION;
 		r1.tstamp = tstamp;
 		r1.val = resolution;