diff options
| author | Eric Laurent <elaurent@google.com> | 2016-01-12 18:03:24 +0000 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2016-01-12 18:04:52 +0000 |
| commit | 9cebd7cfba272117522617661cf9d4985880921e (patch) | |
| tree | 97d9ae2ed253f1dc8b02536415482ad57db06983 /media | |
| parent | b1338d3cfcb47d0fc5f21e2b939d66316b307fe3 (diff) | |
| download | frameworks_av-9cebd7cfba272117522617661cf9d4985880921e.zip frameworks_av-9cebd7cfba272117522617661cf9d4985880921e.tar.gz frameworks_av-9cebd7cfba272117522617661cf9d4985880921e.tar.bz2 | |
DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
This reverts commit 9e29523b9537983b4c4b205ff868d0b3bca0383b.
Change-Id: Ic9a97d1a98165500dd444b97629349cf082ced94
Diffstat (limited to 'media')
| -rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 5 | ||||
| -rw-r--r-- | media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 86ce27a..40c7fef 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -3053,10 +3053,7 @@ int Effect_command(effect_handle_t self, //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_GET_PARAM start"); effect_param_t *p = (effect_param_t *)pCmdData; - if (SIZE_MAX - sizeof(effect_param_t) < (size_t)p->psize) { - android_errorWriteLog(0x534e4554, "26347509"); - return -EINVAL; - } + if (pCmdData == NULL || cmdSize < sizeof(effect_param_t) || cmdSize < (sizeof(effect_param_t) + p->psize) || pReplyData == NULL || replySize == NULL || diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp index 4dc8b45..a48a4e3 100644 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -1956,10 +1956,7 @@ int Reverb_command(effect_handle_t self, //ALOGV("\tReverb_command cmdCode Case: " // "EFFECT_CMD_GET_PARAM start"); effect_param_t *p = (effect_param_t *)pCmdData; - if (SIZE_MAX - sizeof(effect_param_t) < (size_t)p->psize) { - android_errorWriteLog(0x534e4554, "26347509"); - return -EINVAL; - } + if (pCmdData == NULL || cmdSize < sizeof(effect_param_t) || cmdSize < (sizeof(effect_param_t) + p->psize) || pReplyData == NULL || replySize == NULL || |