aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:20 -0400
committerSimon Shields <keepcalm444@gmail.com>2016-05-17 22:11:13 +1000
commit75f9d7249fcdce27a26aa50a1620f60d24b9afc5 (patch)
treea3b8b8b67c374fa13d4e104bec015e98ae2613ed /sound
parent09019d5a21ea44e73c7c850e815d11f26a15b813 (diff)
downloadkernel_samsung_smdk4412-75f9d7249fcdce27a26aa50a1620f60d24b9afc5.tar.gz
kernel_samsung_smdk4412-75f9d7249fcdce27a26aa50a1620f60d24b9afc5.tar.bz2
kernel_samsung_smdk4412-75f9d7249fcdce27a26aa50a1620f60d24b9afc5.zip
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. Change-Id: I5ece63432f6ca6251fa31c046c211c8c03313a59 Signed-off-by: Kangjie Lu <kjlu@gatech.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 269108af015..c0a11d59522 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1180,6 +1180,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;