commit ae9cf0e22e7d58f399890ef3e92955fa096cd251
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 22 01:39:11 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 22 01:39:11 2013 -0700
tree 84c1fc217965087c5199518b6747550b95504c83
parent a5396e5685be293043fd36e2364b11411acf3c74
parent 9c89b9bcfaf3cedbb74692c65793e98e1a292ed5

Merge "ALSA: core: Fix crash by avoiding appl_ptr crossing 32-bit boundary"

sound/core/pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 8bba8d7..7504576 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -448,7 +448,8 @@
 	runtime->silence_threshold = 0;
 	runtime->silence_size = 0;
 	runtime->boundary = runtime->buffer_size;
-	while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)
+	while (runtime->boundary * 2 * runtime->channels <=
+					LONG_MAX - runtime->buffer_size)
 		runtime->boundary *= 2;
 
 	snd_pcm_timer_resolution_change(substream);