summaryrefslogtreecommitdiff
path: root/sound/core/timer.c
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:32 -0400
committerAmit Pundir <amit.pundir@linaro.org>2016-07-11 12:43:04 +0530
commit7e6a81169b4a9735cb811c2da85708566ac8b7c6 (patch)
treed54b4d20ae46c59931a5d848e18a0b573f9d7a7b /sound/core/timer.c
parent5d9883475a21a4e622b9f51362cfee8b6576b445 (diff)
UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
(cherry pick from commit e4ec8cc8039a7063e24204299b462bd1383184a5) 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> Bug: 28980217 Change-Id: If2bba3c9ffb4e57190583b0bb2524d3b2514b2a3
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 cfa3500a3327..185cb59b4997 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1281,6 +1281,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;