commit 1513f9712dc7c73d12845628f159603c37620484
author Mingshu Pang <mpang@codeaurora.org> Fri May 24 12:43:51 2019 +0800
committer Weiyin Jiang <wjiang@codeaurora.org> Fri May 24 17:12:00 2019 +0800
tree f0ad7f8e6740a14b850f9389d7e562d6228aabcc
parent 1aee8389bb762987399a7c588bba37d55a3e17b6

hal: Fix misc audio hal issues

- add array index range check when accessing pcm_device_table
- handle calloc failure
- avoid null pointer dereference

CRs-Fixed: 2456514
Change-Id: I2bedf0f1015e646973acba17297267eb317949ce

hal/msm8960/platform.c

diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index 416c70b..e16d20a 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -423,7 +423,12 @@
 
 int platform_get_pcm_device_id(audio_usecase_t usecase, int device_type)
 {
-    int device_id;
+    int device_id = -1;
+
+    if ((usecase >= AUDIO_USECASE_MAX) || (usecase <= USECASE_INVALID)) {
+        ALOGE("%s: invalid usecase case idx %d", __func__, usecase);
+        return device_id;
+    }
     if (device_type == PCM_PLAYBACK)
         device_id = pcm_device_table[usecase][0];
     else