Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbb79774 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

ALSA: timer: Fix leak in events via snd_timer_user_ccallback 



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: default avatarKangjie Lu <kjlu@gatech.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbcf19d3

sound/core/timer.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1260,6 +1260,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, 
		tu->tstamp = *tstamp;

		tu->tstamp = *tstamp;

	if ((tu->filter & (1 << event)) == 0 || !tu->tread)

	if ((tu->filter & (1 << event)) == 0 || !tu->tread)

		return;

		return;

	memset(&r1, 0, sizeof(r1));

	r1.event = event;

	r1.event = event;

	r1.tstamp = *tstamp;

	r1.tstamp = *tstamp;

	r1.val = resolution;

	r1.val = resolution;