Patch "ALSA: hrtimer: Fix stall by hrtimer_cancel()" has been added to the 3.10-stable tree

[<gregkh@linuxfoundation.org>]

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

    ALSA: hrtimer: Fix stall by hrtimer_cancel()

to the 3.10-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-hrtimer-fix-stall-by-hrtimer_cancel.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 2ba1fe7a06d3624f9a7586d672b55f08f7c670f3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 18 Jan 2016 13:52:47 +0100
Subject: ALSA: hrtimer: Fix stall by hrtimer_cancel()

From: Takashi Iwai <tiwai@suse.de>

commit 2ba1fe7a06d3624f9a7586d672b55f08f7c670f3 upstream.

hrtimer_cancel() waits for the completion from the callback, thus it
must not be called inside the callback itself.  This was already a
problem in the past with ALSA hrtimer driver, and the early commit
[fcfdebe70759: ALSA: hrtimer - Fix lock-up] tried to address it.

However, the previous fix is still insufficient: it may still cause a
lockup when the ALSA timer instance reprograms itself in its callback.
Then it invokes the start function even in snd_timer_interrupt() that
is called in hrtimer callback itself, results in a CPU stall.  This is
no hypothetical problem but actually triggered by syzkaller fuzzer.

This patch tries to fix the issue again.  Now we call
hrtimer_try_to_cancel() at both start and stop functions so that it
won't fall into a deadlock, yet giving some chance to cancel the queue
if the functions have been called outside the callback.  The proper
hrtimer_cancel() is called in anyway at closing, so this should be
enough.

Reported-and-tested-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/core/hrtimer.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -90,7 +90,7 @@ static int snd_hrtimer_start(struct snd_
 	struct snd_hrtimer *stime = t->private_data;
 
 	atomic_set(&stime->running, 0);
-	hrtimer_cancel(&stime->hrt);
+	hrtimer_try_to_cancel(&stime->hrt);
 	hrtimer_start(&stime->hrt, ns_to_ktime(t->sticks * resolution),
 		      HRTIMER_MODE_REL);
 	atomic_set(&stime->running, 1);
@@ -101,6 +101,7 @@ static int snd_hrtimer_stop(struct snd_t
 {
 	struct snd_hrtimer *stime = t->private_data;
 	atomic_set(&stime->running, 0);
+	hrtimer_try_to_cancel(&stime->hrt);
 	return 0;
 }
 


Patches currently in stable-queue which might be from tiwai@suse.de are

queue-3.10/alsa-hrtimer-fix-stall-by-hrtimer_cancel.patch
queue-3.10/alsa-timer-harden-slave-timer-list-handling.patch
queue-3.10/alsa-timer-fix-double-unlink-of-active_list.patch
queue-3.10/alsa-control-avoid-kernel-warnings-from-tlv-ioctl-with-numid-0.patch
queue-3.10/alsa-hda-realtek-fix-silent-headphone-output-on-macpro-4-1-v2.patch
queue-3.10/alsa-rme96-fix-unexpected-volume-reset-after-rate-changes.patch
queue-3.10/alsa-hda-set-skl-hda-controller-power-at-freeze-and-thaw.patch
queue-3.10/alsa-hda-add-inverted-dmic-for-packard-bell-dots.patch
queue-3.10/alsa-hda-add-intel-lewisburg-device-ids-audio.patch
queue-3.10/alsa-seq-fix-race-at-timer-setup-and-close.patch
queue-3.10/alsa-pcm-fix-snd_pcm_hw_params-struct-copy-in-compat-mode.patch
queue-3.10/alsa-seq-fix-snd_seq_call_port_info_ioctl-in-compat-mode.patch
queue-3.10/alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch
queue-3.10/alsa-timer-fix-race-among-timer-ioctls.patch
queue-3.10/alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch