summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:20 -0400
committerJiri Slaby <jslaby@suse.cz>2016-07-21 08:36:06 +0200
commit640b1f79615c2b7dfba517aba7a8164c489da10c (patch)
tree9554b4cf0b6d667af637dde5ce29d912c5c5999b /sound
parent16e5f4c6ea671ffce2ee49e308c1e812144547d2 (diff)
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6 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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
-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 7bf8186472fb..aa0582c5dd2e 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1218,6 +1218,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;