summaryrefslogtreecommitdiff
path: root/sound/core/timer.c
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:20 -0400
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-08 14:46:47 -0700
commitcb93febf41fec5d54987c0da03c3964ebcaecf7b (patch)
tree775027b12574ce78de592dea90225b7fba8cea75 /sound/core/timer.c
parent3388724cb98b8e6e851fa5110b58b99a688a0699 (diff)
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
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. b/28980217 Git-commit: 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6 Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git Signed-off-by: Kangjie Lu <kjlu@gatech.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org> (cherry picked from commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6) Change-Id: I12949efac2aba669d302908704005fb94ba7efd7
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r--sound/core/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 85a8e13fb889..3c7d148e42fb 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;