commit 0f7d11bbaeded3bc314e8e52b85660f31541ef6f
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 28 00:53:29 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 28 00:53:29 2020 -0700
tree 3b5e8ddf12cf3dc0b5e1e0fc98be3773925d29db
parent 22bc0e94b8be36f3ae1b55a97f6c34db08e8f7fa
parent 9c4f79378567cd05d2a87626c22686b5d5c33d38

Merge "st-hal: Prevent st_device callback handling before initialization"

sound_trigger_hw.c

diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 0307802..16eded7 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -2558,7 +2558,8 @@
 
 static int stdev_close(hw_device_t *device)
 {
-    struct sound_trigger_device *stdev = (struct sound_trigger_device *)device;
+    struct sound_trigger_device *st_device =
+        (struct sound_trigger_device *)device;
     st_session_t *st_session = NULL;
     struct listnode *node = NULL, *tmp_node = NULL;
     int status = 0;
@@ -2567,18 +2568,18 @@
     ATRACE_BEGIN("sthal: stdev_close");
 
     pthread_mutex_lock(&stdev_init_lock);
-    if (!stdev || (--stdev_ref_cnt != 0)) {
+    if (!st_device || (--stdev_ref_cnt != 0)) {
         goto exit;
     }
 
-    pthread_mutex_lock(&stdev->lock);
+    pthread_mutex_lock(&st_device->lock);
     sthw_extn_lpma_deinit();
-    platform_stdev_deinit(stdev->platform);
-    free(stdev->arm_pcm_use_cases);
-    free(stdev->ape_pcm_use_cases);
-    free(stdev->dev_ref_cnt);
-    free(stdev->dev_enable_cnt);
-    list_for_each_safe(node, tmp_node, &stdev->sound_model_list) {
+    platform_stdev_deinit(st_device->platform);
+    free(st_device->arm_pcm_use_cases);
+    free(st_device->ape_pcm_use_cases);
+    free(st_device->dev_ref_cnt);
+    free(st_device->dev_enable_cnt);
+    list_for_each_safe(node, tmp_node, &st_device->sound_model_list) {
         st_session = node_to_item(node, st_session_t, list_node);
         list_remove(node);
         st_session_stop_lab(st_session);
@@ -2591,28 +2592,29 @@
         free(st_session);
     }
 
-    pthread_mutex_unlock(&stdev->lock);
+    pthread_mutex_unlock(&st_device->lock);
     hw_session_notifier_deinit();
 
-    if (stdev->transit_to_adsp_on_playback ||
-        stdev->transit_to_adsp_on_battery_charging) {
-        stdev->stop_transitions_thread_loop = true;
-        pthread_cond_signal(&stdev->transitions_cond);
-        status = pthread_join(stdev->transitions_thread, NULL);
+    if (st_device->transit_to_adsp_on_playback ||
+        st_device->transit_to_adsp_on_battery_charging) {
+        st_device->stop_transitions_thread_loop = true;
+        pthread_cond_signal(&st_device->transitions_cond);
+        status = pthread_join(st_device->transitions_thread, NULL);
         if (status)
             ALOGE("%s: Error joining transitions thread. status = %d",
                 __func__, status);
     }
 
-    pthread_mutex_destroy(&stdev->lock);
-    pthread_mutex_destroy(&stdev->ref_cnt_lock);
+    pthread_mutex_destroy(&st_device->lock);
+    pthread_mutex_destroy(&st_device->ref_cnt_lock);
     free(device);
     stdev = NULL;
 
 exit:
     pthread_mutex_unlock(&stdev_init_lock);
     ATRACE_END();
-    ALOGD("%s: Exit device=%p cnt=%d ", __func__, stdev, stdev_ref_cnt);
+    ALOGD("%s: Exit device=%p cnt=%d ", __func__, st_device,
+        stdev_ref_cnt);
     return 0;
 }
 
@@ -2854,8 +2856,11 @@
     st_exec_mode_t exec_mode = 0;
     sound_model_handle_t sm_handle = 0;
 
-    if (!stdev)
+    pthread_mutex_lock(&stdev_init_lock);
+    if (!stdev) {
+        pthread_mutex_unlock(&stdev_init_lock);
         return -ENODEV;
+    }
 
     switch (event) {
     case AUDIO_EVENT_PLAYBACK_STREAM_INACTIVE:
@@ -3091,6 +3096,7 @@
         break;
     }
 
+    pthread_mutex_unlock(&stdev_init_lock);
     return ret;
 }