summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:07 -0400
committerBen Hutchings <ben@decadent.org.uk>2016-08-22 22:37:18 +0100
commitc76456ef3f9371a7647f6dea87e8cdcc38cb33db (patch)
tree6c1af41b0723e4a54c9a0e082b152a9b1e5679e0
parent05b352b3503450e32a6b3b4fad6358d7bf1290f5 (diff)
downloadlinux-stable-c76456ef3f9371a7647f6dea87e8cdcc38cb33db.tar.gz
linux-stable-c76456ef3f9371a7647f6dea87e8cdcc38cb33db.tar.bz2
linux-stable-c76456ef3f9371a7647f6dea87e8cdcc38cb33db.zip
ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
commit cec8f96e49d9be372fdb0c3836dcf31ec71e457e upstream. The stack object “tread” 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: Ben Hutchings <ben@decadent.org.uk>
-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 3e36dbe52900..b77858f39a38 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1712,6 +1712,7 @@ static int snd_timer_user_params(struct file *file,
if (tu->timeri->flags & SNDRV_TIMER_IFLG_EARLY_EVENT) {
if (tu->tread) {
struct snd_timer_tread tread;
+ memset(&tread, 0, sizeof(tread));
tread.event = SNDRV_TIMER_EVENT_EARLY;
tread.tstamp.tv_sec = 0;
tread.tstamp.tv_nsec = 0;