summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:07 -0400
committerJiri Slaby <jslaby@suse.cz>2016-07-21 08:36:06 +0200
commit16e5f4c6ea671ffce2ee49e308c1e812144547d2 (patch)
treef64a37ee5f5de2c32b86b755c9f5addcd9d9d8be /sound
parent6210a912820ae3d99dddc41a0fe5a105a5647921 (diff)
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: 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 10463beae4bb..7bf8186472fb 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1717,6 +1717,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;