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

Commit 91812147 authored by Venkata Narendra Kumar Gutta's avatar Venkata Narendra Kumar Gutta
Browse files

hal: Avoid double free while closing of VoIP driver 

There is a double free happening while closing of VoIP
driver using passthrough apk. There is no protection of
VoIP node during close of  VoIP driver. Add protection
to avoid double free of VoIP node.

Change-Id: I54c2a6aec525590e3e6782d356168f8fe8dc86b0
parent 2e52c574

hal/audio_hw.c

+10 −0
Original line number Diff line number Diff line
@@ -1779,7 +1779,9 @@ exit: 
        if (out->pcm)

            ALOGE("%s: error %d - %s", __func__, ret, pcm_get_error(out->pcm));

        if (out->usecase == USECASE_COMPRESS_VOIP_CALL) {

            pthread_mutex_lock(&adev->lock);

            voice_extn_compress_voip_close_output_stream(&out->stream.common);

            pthread_mutex_unlock(&adev->lock);

            out->standby = true;

        }

        out_standby(&out->stream.common);
@@ -2189,7 +2191,9 @@ exit: 


    if (ret != 0) {

        if (in->usecase == USECASE_COMPRESS_VOIP_CALL) {

            pthread_mutex_lock(&adev->lock);

            voice_extn_compress_voip_close_input_stream(&in->stream.common);

            pthread_mutex_unlock(&adev->lock);

            in->standby = true;

        }

        in_standby(&in->stream.common);
@@ -2506,7 +2510,9 @@ static void adev_close_output_stream(struct audio_hw_device *dev, 
    ALOGD("%s: enter:stream_handle(%p)",__func__, out);



    if (out->usecase == USECASE_COMPRESS_VOIP_CALL) {

        pthread_mutex_lock(&adev->lock);

        ret = voice_extn_compress_voip_close_output_stream(&stream->common);

        pthread_mutex_unlock(&adev->lock);

        if(ret != 0)

            ALOGE("%s: Compress voip output cannot be closed, error:%d",

                  __func__, ret);
@@ -2845,10 +2851,14 @@ static void adev_close_input_stream(struct audio_hw_device *dev, 
{

    int ret;

    struct stream_in *in = (struct stream_in *)stream;

    struct audio_device *adev = in->dev;



    ALOGD("%s: enter:stream_handle(%p)",__func__, in);



    if (in->usecase == USECASE_COMPRESS_VOIP_CALL) {

        pthread_mutex_lock(&adev->lock);

        ret = voice_extn_compress_voip_close_input_stream(&stream->common);

        pthread_mutex_unlock(&adev->lock);

        if (ret != 0)

            ALOGE("%s: Compress voip input cannot be closed, error:%d",

                  __func__, ret);