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

Commit bf1d47f3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge af03f789 on remote branch 

Change-Id: Ifc72b9a10aea0f6826dec11edbb6bab07a9080c2
parents cad13daf af03f789

post_proc/bundle.c

+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
 * Copyright (c) 2013-2017, 2019, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -847,7 +849,8 @@ int effect_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, 
            pReplyData == NULL ||

            *replySize < (int)(sizeof(effect_param_t) + sizeof(uint32_t) + sizeof(uint16_t)) ||

            // constrain memcpy below

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

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

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

            status = -EINVAL;

            ALOGW("EFFECT_CMD_GET_PARAM invalid command cmdSize %d *replySize %d",

                  cmdSize, *replySize);

post_proc/volume_listener.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, 2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -559,7 +561,7 @@ static int vol_effect_command(effect_handle_t self, 
            bool recompute_gain_dep_cal_Level = false;

            ALOGV("cmd called EFFECT_CMD_SET_DEVICE ");



            if (p_cmd_data == NULL) {

            if (p_cmd_data == NULL || cmd_size < sizeof(uint32_t)) {

                ALOGE("%s: EFFECT_CMD_SET_DEVICE: cmd data NULL", __func__);

                status = -EINVAL;

                goto exit;

visualizer/offload_visualizer.c

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -1321,7 +1322,10 @@ int effect_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, 
        if (pCmdData == NULL ||

            cmdSize != (int)(sizeof(effect_param_t) + sizeof(uint32_t)) ||

            pReplyData == NULL ||

            *replySize < (int)(sizeof(effect_param_t) + sizeof(uint32_t) + sizeof(uint32_t))) {

            *replySize < (int)(sizeof(effect_param_t) + sizeof(uint32_t) + sizeof(uint32_t)) ||

            // constrain memcpy below

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

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

            status = -EINVAL;

            goto exit;

        }

voice_processing/voice_processing.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -582,7 +583,8 @@ static int fx_command(effect_handle_t self, 
                    pReplyData == NULL ||

                    *replySize < (int)sizeof(effect_param_t) ||

                    // constrain memcpy below

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

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

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

                ALOGV("fx_command() EFFECT_CMD_GET_PARAM invalid args");

                return -EINVAL;

            }