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

Commit f96b08d5 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Change order of EFFECT_CMD_GET_PARAM command size check"

parents d3c61c2c b3456644

services/audioflinger/Effects.cpp

+7 −6
Original line number Diff line number Diff line
@@ -598,17 +598,18 @@ status_t AudioFlinger::EffectModule::command(uint32_t cmdCode, 
    if (mStatus != NO_ERROR) {

        return mStatus;

    }

    if (cmdCode == EFFECT_CMD_GET_PARAM &&

            (*replySize < sizeof(effect_param_t) ||

                    ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t))) {

        android_errorWriteLog(0x534e4554, "29251553");

        return -EINVAL;

    }

    if (cmdCode == EFFECT_CMD_GET_PARAM &&

            (sizeof(effect_param_t) > cmdSize ||

                    ((effect_param_t *)pCmdData)->psize > cmdSize

                                                          - sizeof(effect_param_t))) {

        android_errorWriteLog(0x534e4554, "32438594");

        android_errorWriteLog(0x534e4554, "33003822");

        return -EINVAL;

    }

    if (cmdCode == EFFECT_CMD_GET_PARAM &&

            (*replySize < sizeof(effect_param_t) ||

                    ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t))) {

        android_errorWriteLog(0x534e4554, "29251553");

        return -EINVAL;

    }

    if ((cmdCode == EFFECT_CMD_SET_PARAM