Skip to contentSkip to conversation

Patch "ALSA: timer: Fix wrong instance passed to slave callbacks" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Feb 14, 2016

Subsystems (2)
Stable branch Sound
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ALSA: timer: Fix wrong instance passed to slave callbacks

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
alsa-timer-fix-wrong-instance-passed-to-slave-callbacks.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 117159f0b9d392fb433a7871426fad50317f06f7 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Mon, 8 Feb 2016 17:36:25 +0100
Subject: ALSA: timer: Fix wrong instance passed to slave callbacks

From: Takashi Iwai <[email protected]>

commit 117159f0b9d392fb433a7871426fad50317f06f7 upstream.

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 open here
Reported-by Dmitry Vyukov <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 sound/core/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/timer.c +1 -1
@@ -415,7 +415,7 @@ static void snd_timer_notify1(struct snd
 	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);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/alsa-seq-fix-race-at-closing-in-virmidi-driver.patch queue-3.14/alsa-rawmidi-remove-kernel-warning-for-null-user-space-buffer-check.patch queue-3.14/alsa-hda-fix-static-checker-warning-in-patch_hdmi.c.patch queue-3.14/alsa-seq-fix-lockdep-warnings-due-to-double-mutex-locks.patch queue-3.14/alsa-usb-audio-fix-teac-ud-501-ud-503-nt-503-usb-delay.patch queue-3.14/alsa-timer-fix-wrong-instance-passed-to-slave-callbacks.patch queue-3.14/alsa-compress-disable-get_codec_caps-ioctl-for-some-architectures.patch queue-3.14/alsa-hda-fix-speaker-output-from-vaio-aio-machines.patch queue-3.14/alsa-dummy-implement-timer-backend-switching-more-safely.patch queue-3.14/alsa-dummy-disable-switching-timer-backend-via-sysfs.patch queue-3.14/alsa-seq-fix-incorrect-sanity-check-at-snd_seq_oss_synth_cleanup.patch queue-3.14/alsa-seq-fix-yet-another-races-among-alsa-timer-accesses.patch queue-3.14/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch queue-3.14/alsa-hda-add-fixup-for-mac-mini-7-1-model.patch queue-3.14/alsa-timer-fix-leftover-link-at-closing.patch queue-3.14/alsa-rawmidi-fix-race-at-copying-updating-the-position.patch queue-3.14/alsa-pcm-fix-potential-deadlock-in-oss-emulation.patch queue-3.14/alsa-timer-fix-link-corruption-due-to-double-start-or-stop.patch