diff options
| author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:44:20 -0400 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-07-11 12:43:04 +0530 |
| commit | 1a4f1f286f4be63d2085e307f69f3be9da08b1c4 (patch) | |
| tree | e28e889da05078424ad21f5fa2b46334c93566ad | |
| parent | 7e6a81169b4a9735cb811c2da85708566ac8b7c6 (diff) | |
UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback
(cherry pick from 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>
Bug: 28980217
Change-Id: I2e4c27352894b9f1f4c808b8db3ae5f9284faec1
| -rw-r--r-- | sound/core/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 185cb59b4997..a3f547badd38 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; |