commit f0f23126b522d2c4693966db8e26a8722c45f3a4
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 09 07:11:12 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 09 07:11:12 2020 +0000
tree 42707a5bbf7a2139690191296b68a75acb3b1c8e
parent 0e98d6e2d16053c7c01b404a738e4a10867d31ce
parent acb0b32e8f4369a97c33f49540d69852fc2cdc8e

Snap for 6571063 from acb0b32e8f4369a97c33f49540d69852fc2cdc8e to mainline-release

Change-Id: I4805e72b06c7a5e6e54e5685560fad75f818c9a8

sound_trigger_hw_iaxxx.c

diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c
index 91f78fc..014c96a 100644
--- a/sound_trigger_hw_iaxxx.c
+++ b/sound_trigger_hw_iaxxx.c
@@ -2683,7 +2683,7 @@
     int ret = 0;
     int kw_model_sz = 0;
     int i = 0;
-
+    sound_trigger_uuid_t empty_uuid = {0};
     unsigned char *kw_buffer = NULL;
 
     ALOGD("+%s+", __func__);
@@ -2706,6 +2706,12 @@
         goto exit;
     }
 
+    if (check_uuid_equality(sound_model->vendor_uuid, empty_uuid)) {
+        ALOGE("%s Invalid vendor uuid", __func__);
+        ret = -EINVAL;
+        goto exit;
+    }
+
     // When a delayed CHRE/Oslo destroy process is in progress,
     // we should not skip the new model and return the existing handle
     // which will be destroyed soon.