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

Commit 764bdbc8 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "audioserver: fix UID checks for multi user" into pi-dev 

am: b1eb7174

Change-Id: Ib66e1c2f566c3e6241eda8bd2f4f5478ebedf991
parents 2c0b7516 b1eb7174

media/libaudioclient/IAudioFlinger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -903,13 +903,15 @@ status_t BnAudioFlinger::onTransact( 
        case SET_MODE:

        case SET_MIC_MUTE:

        case SET_LOW_RAM_DEVICE:

        case SYSTEM_READY:

            if (IPCThreadState::self()->getCallingUid() >= AID_APP_START) {

        case SYSTEM_READY: {

            uid_t multiUserClientUid = IPCThreadState::self()->getCallingUid() % AID_USER_OFFSET;

            if (multiUserClientUid >= AID_APP_START) {

                ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",

                      __func__, code, IPCThreadState::self()->getCallingPid(),

                      IPCThreadState::self()->getCallingUid());

                return INVALID_OPERATION;

            }

        } break;

        default:

            break;

    }

media/libaudioclient/IAudioPolicyService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -872,13 +872,15 @@ status_t BnAudioPolicyService::onTransact( 
        case INIT_STREAM_VOLUME:

        case SET_STREAM_VOLUME:

        case REGISTER_POLICY_MIXES:

        case SET_MASTER_MONO:

            if (IPCThreadState::self()->getCallingUid() >= AID_APP_START) {

        case SET_MASTER_MONO: {

            uid_t multiUserClientUid = IPCThreadState::self()->getCallingUid() % AID_USER_OFFSET;

            if (multiUserClientUid >= AID_APP_START) {

                ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",

                      __func__, code, IPCThreadState::self()->getCallingPid(),

                      IPCThreadState::self()->getCallingUid());

                return INVALID_OPERATION;

            }

        } break;

        default:

            break;

    }

services/audiopolicy/service/AudioPolicyService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void AudioPolicyService::NotificationClient::onAudioPatchListUpdate() 
void AudioPolicyService::NotificationClient::onDynamicPolicyMixStateUpdate(

        const String8& regId, int32_t state)

{

    if (mAudioPolicyServiceClient != 0 && mUid < AID_APP_START) {

    if (mAudioPolicyServiceClient != 0 && (mUid % AID_USER_OFFSET) < AID_APP_START) {

        mAudioPolicyServiceClient->onDynamicPolicyMixStateUpdate(regId, state);

    }

}
@@ -283,7 +283,7 @@ void AudioPolicyService::NotificationClient::onRecordingConfigurationUpdate( 
        const audio_config_base_t *clientConfig, const audio_config_base_t *deviceConfig,

        audio_patch_handle_t patchHandle)

{

    if (mAudioPolicyServiceClient != 0 && mUid < AID_APP_START) {

    if (mAudioPolicyServiceClient != 0 && (mUid % AID_USER_OFFSET) < AID_APP_START) {

        mAudioPolicyServiceClient->onRecordingConfigurationUpdate(event, clientInfo,

                clientConfig, deviceConfig, patchHandle);

    }