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: submit/tizen/20171013.014523~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69f5625d09a02d2937cac0f25cbcf4b2c2bea622;p=profile%2Fmobile%2Fplatform%2Fkernel%2Flinux-3.10-sc7730.git

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: Willy Tarreau <w@1wt.eu>

[sw0312.kim: cherry-pick from linux-3.10.y to fix CVE-2016-4578]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

Change-Id: I19dd2f10f3bac21d77b74d439191f8804b242e10
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 1c340e7..b9cbf20 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1219,6 +1219,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;