From addd6e9f0e25efb00d813d54528607c75b77c416 Mon Sep 17 00:00:00 2001

From: Kangjie Lu <kangjielu@gmail.com>

Date: Tue, 3 May 2016 16:44:20 -0400

Subject: [PATCH 2/3] ALSA: timer: Fix leak in events via

 snd_timer_user_ccallback

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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>

---

 sound/core/timer.c | 1 +

 1 file changed, 1 insertion(+)

diff --git a/sound/core/timer.c b/sound/core/timer.c

index 964f5ebf495e..e98fa5feb731 100644

--- a/sound/core/timer.c

+++ b/sound/core/timer.c

@@ -1225,6 +1225,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;

-- 

2.5.5