From: Kangjie Lu <kangjielu@gmail.com>
Date: Tue, 3 May 2016 20:44:32 +0000 (-0400)
Subject: UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
X-Git-Tag: firefly_0821_release~176^2~380
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e6a81169b4a9735cb811c2da85708566ac8b7c6;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt

(cherry pick from commit e4ec8cc8039a7063e24204299b462bd1383184a5)

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>
Bug: 28980217
Change-Id: If2bba3c9ffb4e57190583b0bb2524d3b2514b2a3
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index cfa3500a3327..185cb59b4997 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1281,6 +1281,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;