]> git.hungrycats.org Git - linux/commitdiff
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
authorKangjie Lu <kangjielu@gmail.com>
Tue, 3 May 2016 20:44:20 +0000 (16:44 -0400)
committerSasha Levin <alexander.levin@verizon.com>
Sat, 20 Aug 2016 03:08:46 +0000 (23:08 -0400)
[ 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>
sound/core/timer.c

index e55f045d6289803cf16ecb1e6a8b9eaa0788883a..224866316a29bfb7a6fb17875eb62bdc81ad64c4 100644 (file)
@@ -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;