commit 105861cb3defb8c64b8cf18ce34fe9526b20331e
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 07 04:11:19 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 07 04:11:20 2020 -0700
tree 79c38e016b993125e00029a33d295eba8e3c2a9e
parent 1e74326d3fc4ea885d83fa364b97004bff35d4d2
parent b067f4751548b3076945806e4d836397a7b7bb99

Merge "st-hal: Fix potential NULL pointer dereference" into audio-hal.lnx.8.0

st_session.c

diff --git a/st_session.c b/st_session.c
index 10aef77..a2d9b03 100644
--- a/st_session.c
+++ b/st_session.c
@@ -2603,6 +2603,12 @@
         if (v_info->merge_fs_soundmodels) {
             /* merge_fs_soundmodels is true only for QC SVA UUID */
 
+            if (conf_levels == NULL) {
+                ALOGE("%s: Unexpected, conf_levels pointer is NULL",
+                      __func__);
+                status = -EINVAL;
+                return status;
+            }
              /*
               * Note:
               * For ADSP case, the generated conf levles size must be equal to
@@ -2711,6 +2717,13 @@
 
 
     } else {
+        if (conf_levels == NULL) {
+                ALOGE("%s: Unexpected, conf_levels pointer is NULL",
+                      __func__);
+                status = -EINVAL;
+                return status;
+        }
+
         if (!st_ses->lab_enabled && enable_lab)
             st_ses->lab_enabled = true;