diff options
author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:44:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-10 11:49:26 +0200 |
commit | 3e6af33c73fb7ec7be8dedd01047162ef64a26a5 (patch) | |
tree | aa38c8535d985998c96ec94b1fac098c435dd4cb | |
parent | 90bed827ea910f82ab17ee154f501b5ae71617e6 (diff) |
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | sound/core/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 245c5f340ae5..3a5e0dd9cebe 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1247,6 +1247,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; |