diff options
author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:44:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-10 10:21:02 +0200 |
commit | b40763254a772aaa1353237694eff230db004d7b (patch) | |
tree | 20ebaab62ee6d7411a54c51eee9d7a6fcc24dbb2 | |
parent | 414d03573fe4e942f07b1c3c8750227c6be0b061 (diff) | |
download | lwn-b40763254a772aaa1353237694eff230db004d7b.tar.gz lwn-b40763254a772aaa1353237694eff230db004d7b.zip |
ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
commit e4ec8cc8039a7063e24204299b462bd1383184a5 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 7ba0709726b5..3476895ee1fb 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1243,6 +1243,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri, } if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) && tu->last_resolution != resolution) { + memset(&r1, 0, sizeof(r1)); r1.event = SNDRV_TIMER_EVENT_RESOLUTION; r1.tstamp = tstamp; r1.val = resolution; |