commit baa3125935c6235c38fc128f7972f27f0afd240e
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 21 09:38:21 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 21 09:38:21 2015 -0800
tree ae596627f20c5d2d21a16be95fc3c268e0599aa2
parent 1147f08d976cda171ce3552c3114528accdc8ac9
parent 04ab3d3c9eaf6c0cc2b5f3ccb207837f96dd62d6

Merge "hal: add checks for calibration buffer allocation failures"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 4b71451..ca6d79b 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -861,10 +861,16 @@
         }
         calib.get_size = 0;
         calib.buff = malloc(calib.buff_size);
+        if(calib.buff == NULL) {
+            ALOGE("%s mem allocation for %d bytes for %s failed\n"
+                , __func__, calib.buff_size, cal_name_info[type]);
+            return -1;
+        }
         ret = acdb_loader_get_calibration(cal_name_info[type],
                               sizeof(struct param_data), &calib);
         if (ret < 0) {
-            ALOGE("%s get_calibration failed\n", __func__);
+            ALOGE("%s get_calibration failed type=%s calib.size=%d\n"
+                , __func__, cal_name_info[type], codec_buffer.size);
             free(calib.buff);
             return ret;
         }
@@ -872,9 +878,10 @@
         codec_buffer.size = calib.data_size;
         codec_buffer.cal_type = type;
         if (ioctl(fd, SNDRV_CTL_IOCTL_HWDEP_CAL_TYPE, &codec_buffer) < 0)
-            ALOGE("Failed to call ioctl  for %s err=%d",
-                                  cal_name_info[type], errno);
-        ALOGD("%s cal sent for %s", __func__, cal_name_info[type]);
+            ALOGE("Failed to call ioctl  for %s err=%d calib.size=%d",
+                cal_name_info[type], errno, codec_buffer.size);
+        ALOGD("%s cal sent for %s calib.size=%d"
+            , __func__, cal_name_info[type], codec_buffer.size);
         free(calib.buff);
     }
     return ret;