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

Commit 6096dcd5 authored by Andy Hung's avatar Andy Hung
Browse files

AudioFlinger: createEffect - check for proper sessionId 

Output error messages on failure.

Test: CTS effects, dedicated test with bad sessionId
Bug: 128528126
Change-Id: Icdd306c30e8eb818b0a27d6463fa785bac2fb707
parent 1631f06f

services/audioflinger/AudioFlinger.cpp

+32 −18
Original line number Diff line number Diff line
@@ -3208,24 +3208,44 @@ sp<IEffect> AudioFlinger::createEffect( 
        goto Exit;

    }



    if (mEffectsFactoryHal == 0) {

        ALOGE("%s: no effects factory hal", __func__);

        lStatus = NO_INIT;

        goto Exit;

    }



    // check audio settings permission for global effects

    if (sessionId == AUDIO_SESSION_OUTPUT_MIX && !settingsAllowed()) {

    if (sessionId == AUDIO_SESSION_OUTPUT_MIX) {

        if (!settingsAllowed()) {

            ALOGE("%s: no permission for AUDIO_SESSION_OUTPUT_MIX", __func__);

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }



    // Session AUDIO_SESSION_OUTPUT_STAGE is reserved for output stage effects

    // that can only be created by audio policy manager

    if (sessionId == AUDIO_SESSION_OUTPUT_STAGE && !isAudioServerUid(callingUid)) {

    } else if (sessionId == AUDIO_SESSION_OUTPUT_STAGE) {

        if (!isAudioServerUid(callingUid)) {

            ALOGE("%s: only APM can create using AUDIO_SESSION_OUTPUT_STAGE", __func__);

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }



    if (mEffectsFactoryHal == 0) {

        lStatus = NO_INIT;

        if (io == AUDIO_IO_HANDLE_NONE) {

            ALOGE("%s: APM must specify output when using AUDIO_SESSION_OUTPUT_STAGE", __func__);

            lStatus = BAD_VALUE;

            goto Exit;

        }

    } else {

        // general sessionId.



        if (audio_unique_id_get_use(sessionId) != AUDIO_UNIQUE_ID_USE_SESSION) {

            ALOGE("%s: invalid sessionId %d", __func__, sessionId);

            lStatus = BAD_VALUE;

            goto Exit;

        }



        // TODO: should we check if the callingUid (limited to pid) is in mAudioSessionRefs

        // to prevent creating an effect when one doesn't actually have track with that session?

    }



    {

        // Get the full effect descriptor from the uuid/type.

        // If the session is the output mix, prefer an auxiliary effect,
@@ -3271,12 +3291,6 @@ sp<IEffect> AudioFlinger::createEffect( 
        // because of code checking output when entering the function.

        // Note: io is never 0 when creating an effect on an input

        if (io == AUDIO_IO_HANDLE_NONE) {

            if (sessionId == AUDIO_SESSION_OUTPUT_STAGE) {

                // output must be specified by AudioPolicyManager when using session

                // AUDIO_SESSION_OUTPUT_STAGE

                lStatus = BAD_VALUE;

                goto Exit;

            }

            // look for the thread where the specified audio session is present

            for (size_t i = 0; i < mPlaybackThreads.size(); i++) {

                uint32_t sessionType = mPlaybackThreads.valueAt(i)->hasAudioSession(sessionId);