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

Commit 15555d3e authored by Preetam Singh Ranawat's avatar Preetam Singh Ranawat Committed by Meng Wang
Browse files

ALSA: pcm: fix blocking while loop in snd_pcm_update_hw_ptr0() 



When period interrupts are disabled, while loop in snd_pcm_update_hw_ptr0()
results in the machine locking up if runtime->hw_ptr_buffer_jiffies is 0.

Validate runtime->hw_ptr_buffer_jiffies value before while loop to avoid
delta check.

CRs-Fixed: 1109229
Change-Id: Ib20b71c70aa4a8bee2837d1f3b5a91ad4ce083da
Signed-off-by: default avatarPreetam Singh Ranawat <apranawat@codeaurora.org>
parent a70116e1

sound/core/pcm_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -341,7 +341,12 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		 * the elapsed time to detect xruns.

		 */

		jdelta = curr_jiffies - runtime->hw_ptr_jiffies;

#ifdef CONFIG_AUDIO_QGKI

		if ((jdelta < runtime->hw_ptr_buffer_jiffies / 2) ||

		    (runtime->hw_ptr_buffer_jiffies <= 0))

#else

		if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)

#endif

			goto no_delta_check;

		hdelta = jdelta - delta * HZ / runtime->rate;

		xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;