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

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

(cherry pick from commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6)

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: I2e4c27352894b9f1f4c808b8db3ae5f9284faec1
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 185cb59b4997..a3f547badd38 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1247,6 +1247,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri,
 		tu->tstamp = *tstamp;
 	if ((tu->filter & (1 << event)) == 0 || !tu->tread)
 		return;
+	memset(&r1, 0, sizeof(r1));
 	r1.event = event;
 	r1.tstamp = *tstamp;
 	r1.val = resolution;