aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-07-25 15:17:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-25 15:17:50 +0000
commit056775180137cd91ab729aa92b622d3ad8c19f82 (patch)
tree60b26904ea36e3121122075759a4f35c17c8d09e
parent9caeec64aa1c3d51211c8b040e37980b1bf27a36 (diff)
parent4ffd2647e7b3d77befe6d0c52f5c6c6fec8b7702 (diff)
downloadv4.4-056775180137cd91ab729aa92b622d3ad8c19f82.tar.gz
UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback
am: 4ffd2647e7 Change-Id: I7cd9218d29fa260d41ae06041646d0f9710de546
-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 cfa3500a3327..541053dcc856 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;