Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11f10e29 authored by Andy Hung's avatar Andy Hung
Browse files

audio_hw: make mixer_path obey limits of MIXER_PATH_MAX_LENGTH 

Test: compile and sanity
Bug: 117999014
Change-Id: Ic4be8725765b83a2d5bc00414d663e3884be4ab2
parent a292c0ad

hal/audio_hw.c

+14 −4
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ int enable_audio_route(struct audio_device *adev, 
                       struct audio_usecase *usecase)

{

    snd_device_t snd_device;

    char mixer_path[50];

    char mixer_path[MIXER_PATH_MAX_LENGTH];



    if (usecase == NULL)

        return -EINVAL;
@@ -614,8 +614,13 @@ int enable_audio_route(struct audio_device *adev, 
        snd_device = usecase->out_snd_device;

    audio_extn_utils_send_app_type_cfg(adev, usecase);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    strcpy(mixer_path, use_case_table[usecase->id]);



    // 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(adev->platform, mixer_path, snd_device);



    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);

    ALOGD("%s: usecase(%d) apply and update mixer path: %s", __func__,  usecase->id, mixer_path);

    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
@@ -628,7 +633,7 @@ int disable_audio_route(struct audio_device *adev, 
                        struct audio_usecase *usecase)

{

    snd_device_t snd_device;

    char mixer_path[50];

    char mixer_path[MIXER_PATH_MAX_LENGTH];



    if (usecase == NULL)

        return -EINVAL;
@@ -638,9 +643,14 @@ int disable_audio_route(struct audio_device *adev, 
        snd_device = usecase->in_snd_device;

    else

        snd_device = usecase->out_snd_device;

    strcpy(mixer_path, use_case_table[usecase->id]);



    // 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(adev->platform, mixer_path, snd_device);

    ALOGD("%s: usecase(%d) reset and update mixer path: %s", __func__, usecase->id, mixer_path);



    audio_route_reset_and_update_path(adev->audio_route, mixer_path);

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_FREE);