summaryrefslogtreecommitdiffstats
path: root/sound
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:38:27 +0100
commit84d8697290dd3b2c08be651651a02d30f62d91a7 (patch)
tree030cb2986de508c7c912e3c8202f15edabbf5faa /sound
parent502c7a5b24af01f64d6812a0a382c6beebef9c55 (diff)
downloadlinux-stable-84d8697290dd3b2c08be651651a02d30f62d91a7.tar.gz
linux-stable-84d8697290dd3b2c08be651651a02d30f62d91a7.tar.bz2
linux-stable-84d8697290dd3b2c08be651651a02d30f62d91a7.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>
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 7dfb741a91b4..139efdd74ac8 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1750,6 +1750,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;