[PATCH 3.10 134/180] ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt

From: Willy Tarreau
Date: Sun Aug 21 2016 - 11:55:47 EST


From: Kangjie Lu <kangjielu@xxxxxxxxx>

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: Willy Tarreau <w@xxxxxx>
---
sound/core/timer.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 7ba0709..3476895 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1243,6 +1243,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.8.0.rc2.1.gbe9624a