summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:44:20 -0400
committerSasha Levin <alexander.levin@verizon.com>2016-08-19 23:08:46 -0400
commit1fbc4fd13bd04fd7c7fd033fdfde97e96d2865e5 (patch)
tree1d92891ca3067d7cb03cb6fff43dbca00d68e974
parent1b7d7bce7467cf10f21007a5c952688877ead95e (diff)
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
[ Upstream commit 9a47e9cff994f37f7f0dbd9ae23740d0f64f9fe6 ] 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: Sasha Levin <alexander.levin@verizon.com>
-rw-r--r--sound/core/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index e55f045d6289..224866316a29 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1247,6 +1247,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;