commit 822054eab168f12749f0e6da3244e2adb412d8b7
author Linux Build Service Account <lnxbuild@localhost> Tue Feb 11 20:13:22 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Feb 11 20:13:21 2014 -0800
tree 89f5f8f6b0217ec05f99976d9f1fa21292606efb
parent 70798e2a236fd6547441d596ec849de0befcfb7b
parent e35b1bad35e55454c562dffc636a052ff43f0304

Merge "ASoC: msm: qdsp6v2: Add upper bounds check on index"

sound/soc/msm/qdsp6v2/q6afe.c

diff --git a/sound/soc/msm/qdsp6v2/q6afe.c b/sound/soc/msm/qdsp6v2/q6afe.c
index acb8e70..774a33c 100644
--- a/sound/soc/msm/qdsp6v2/q6afe.c
+++ b/sound/soc/msm/qdsp6v2/q6afe.c
@@ -436,8 +436,9 @@
 	}
 
 	index = q6audio_get_port_index(port_id);
-	if (index < 0) {
-		pr_debug("%s: AFE port index invalid!\n", __func__);
+	if (index < 0 || index > AFE_MAX_PORTS) {
+		pr_debug("%s: AFE port index[%d] invalid!\n",
+				__func__, index);
 		goto done;
 	}
 
@@ -652,8 +653,9 @@
 		goto fail_cmd;
 	}
 	index = q6audio_get_port_index(port_id);
-	if (index < 0) {
-		pr_debug("%s: AFE port index invalid!\n", __func__);
+	if (index < 0 || index > AFE_MAX_PORTS) {
+		pr_debug("%s: AFE port index[%d] invalid!\n",
+				__func__, index);
 		goto fail_cmd;
 	}