[for-3.18,20/24] ALSA: timer: Fix leak in events via snd_timer_user_ccallback

Message ID 1494340968-17152-21-git-send-email-amit.pundir@linaro.org
State New
Headers show
Series
  • Security fixes from 2015 and 2016 android security bulletins
Related show

Commit Message

Amit Pundir May 9, 2017, 2:42 p.m.
From: Kangjie Lu <kangjielu@gmail.com>


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: Amit Pundir <amit.pundir@linaro.org>

---
 sound/core/timer.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.7.4

Patch hide | download patch | download mbox

diff --git a/sound/core/timer.c b/sound/core/timer.c
index ede058bd49a4..47c8beb5eb40 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1260,6 +1260,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;