diff options
| author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:44:20 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:37:19 +0100 |
| commit | 506a6ad7e521baf8e554eedfd09873f490c8a304 (patch) | |
| tree | 49def8437bdb989be85dc3fbd2f2a4dbd572b853 | |
| parent | c76456ef3f9371a7647f6dea87e8cdcc38cb33db (diff) | |
| download | linux-stable-506a6ad7e521baf8e554eedfd09873f490c8a304.tar.gz linux-stable-506a6ad7e521baf8e554eedfd09873f490c8a304.tar.bz2 linux-stable-506a6ad7e521baf8e554eedfd09873f490c8a304.zip | |
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: Ben Hutchings <ben@decadent.org.uk>
| -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 b77858f39a38..08a38befe109 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1213,6 +1213,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; |