[PATCH 3.12 74/88] ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt

[Jiri Slaby]

From: Kangjie Lu <kangjielu@xxxxxxxxx>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

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@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
---
 sound/core/timer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/core/timer.c b/sound/core/timer.c
index aa0582c5dd2e..1902ec0d4487 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1253,6 +1253,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;
-- 
2.9.1