commit 756ecc170848507a129adc149ca2565cc7e1c672
author Andy Hung <hunga@google.com> Fri Oct 19 17:47:12 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 02 23:06:24 2019 -0700
tree 74b630f2ce73da474ed4eb8effcb478446c46bdc
parent 198adc001c0a8756f41ee28bcccf71f2922fe627

audio_hw: make mixer_path obey limits of MIXER_PATH_MAX_LENGTH

Test: compile and sanity
Bug: 117999014
Change-Id: Ic4be8725765b83a2d5bc00414d663e3884be4ab2
(cherry picked from commit 11f10e295e6cdce6ac94da428d747673bdca6a59)

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 9f90d93..392dba6 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1077,7 +1077,10 @@
     }
     audio_extn_set_custom_mtmx_params(adev, usecase, true);
 
-    strlcpy(mixer_path, use_case_table[usecase->id], MIXER_PATH_MAX_LENGTH);
+    // we shouldn't truncate mixer_path
+    ALOGW_IF(strlcpy(mixer_path, use_case_table[usecase->id], sizeof(mixer_path))
+            >= sizeof(mixer_path), "%s: truncation on mixer path", __func__);
+    // this also appends to mixer_path
     platform_add_backend_name(mixer_path, snd_device, usecase);
     ALOGD("%s: apply mixer and update path: %s", __func__, mixer_path);
     ret = audio_route_apply_and_update_path(adev->audio_route, mixer_path);
@@ -1106,7 +1109,10 @@
         snd_device = usecase->in_snd_device;
     else
         snd_device = usecase->out_snd_device;
-    strlcpy(mixer_path, use_case_table[usecase->id], MIXER_PATH_MAX_LENGTH);
+    // we shouldn't truncate mixer_path
+    ALOGW_IF(strlcpy(mixer_path, use_case_table[usecase->id], sizeof(mixer_path))
+            >= sizeof(mixer_path), "%s: truncation on mixer path", __func__);
+    // this also appends to mixer_path
     platform_add_backend_name(mixer_path, snd_device, usecase);
     ALOGD("%s: reset and update mixer path: %s", __func__, mixer_path);
     audio_route_reset_and_update_path(adev->audio_route, mixer_path);