[PATCH 3.2 89/94] ALSA: timer: Fix leak in events via snd_timer_user_ccallback

From: Ben Hutchings
Date: Sun Aug 14 2016 - 07:01:35 EST


3.2.82-rc1 review patch. If anyone has any objections, please let me know.

------------------

From: Kangjie Lu <kangjielu@xxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
sound/core/timer.c | 1 +
1 file changed, 1 insertion(+)

--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1213,6 +1213,7 @@ static void snd_timer_user_ccallback(str
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;