summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:32 -0400
committerTakashi Iwai <tiwai@suse.de>2016-05-08 11:36:17 +0200
commite4ec8cc8039a7063e24204299b462bd1383184a5 (patch)
tree4cd671544225a5bd2d686477e010983f1fc36e63 /sound/core
parent9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6 (diff)
ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
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>
Diffstat (limited to 'sound/core')
-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 cc3c08d17ab1..e722022d325d 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1266,6 +1266,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;