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

Commit 77d0a94d authored by Takashi Iwai's avatar Takashi Iwai Committed by Sasha Levin
Browse files

ALSA: timer: Fix wrong instance passed to slave callbacks 

[ Upstream commit 117159f0b9d392fb433a7871426fad50317f06f7 ]

In snd_timer_notify1(), the wrong timer instance was passed for slave
ccallback function.  This leads to the access to the wrong data when
an incompatible master is handled (e.g. the master is the sequencer
timer and the slave is a user timer), as spotted by syzkaller fuzzer.

This patch fixes that wrong assignment.

BugLink: http://lkml.kernel.org/r/CACT4Y+Y_Bm+7epAb=8Wi=AaWd+DYS7qawX52qxdCfOfY49vozQ@mail.gmail.com


Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 9107eda0

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) 
	spin_lock_irqsave(&timer->lock, flags);

	list_for_each_entry(ts, &ti->slave_active_head, active_list)

		if (ts->ccallback)

			ts->ccallback(ti, event + 100, &tstamp, resolution);

			ts->ccallback(ts, event + 100, &tstamp, resolution);

	spin_unlock_irqrestore(&timer->lock, flags);

}