From 5fb31b9f1a61462aa2b59fc43382ec3bc61fc6a9 Mon Sep 17 00:00:00 2001 From: Kangjie Lu <kangjielu@gmail.com> Date: Tue, 3 May 2016 16:44:32 -0400 Subject: [PATCH] UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt 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. Bug: 28980217 Change-Id: I2bef279bbaa1f20ea831d364b3a4a09a27f07025 Signed-off-by: Kangjie Lu <kjlu@gatech.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Siqi Lin <siqilin@google.com> (cherry picked from commit e4ec8cc8039a7063e24204299b462bd1383184a5) --- sound/core/timer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index a6fb8dcefb58..c6c5aa0849db 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1208,6 +1208,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; -- GitLab