summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 23:44:32 +0300
committerJiri Slaby <jslaby@suse.cz>2016-07-21 09:36:07 +0300
commitbdb8bc5f8fb05ce76a8d4e454fd2981501859020 (patch)
tree7e105feb6d4f3149841344e96f0744bf7fbcf28b /sound
parent640b1f79615c2b7dfba517aba7a8164c489da10c (diff)
downloadlinux-bdb8bc5f8fb05ce76a8d4e454fd2981501859020.tar.xz
ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
commit e4ec8cc8039a7063e24204299b462bd1383184a5 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 aa0582c5dd2e..1902ec0d4487 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1253,6 +1253,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;