diff mbox

[1/2] ALSA: timer: Fix leak in events via snd_timer_user_ccallback

Message ID 1464189445-26878-2-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques May 25, 2016, 3:17 p.m. UTC 
From: Kangjie Lu <kangjielu@gmail.com>

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>
(cherry picked from commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6)
CVE-2016-4578
BugLink: https://bugs.launchpad.net/bugs/1581866
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 sound/core/timer.c | 1 +
 1 file changed, 1 insertion(+)
diff mbox

Patch

diff --git a/sound/core/timer.c b/sound/core/timer.c
index beb41ecb2730..c72023235f0a 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;