diff options
| author | Eric Laurent <elaurent@google.com> | 2016-01-12 02:27:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-12 02:27:05 +0000 |
| commit | de98d9b7c19882dd8c3394c7653ed2eeccee713c (patch) | |
| tree | c495ba98d9a95df70ff3110979003606e56c33af /media | |
| parent | 2b8d26ba65596027d33e3855e1fb203214dfca2d (diff) | |
| parent | 9950df2504daeb1bde86603065ef072155e48ecf (diff) | |
| download | frameworks_av-de98d9b7c19882dd8c3394c7653ed2eeccee713c.zip frameworks_av-de98d9b7c19882dd8c3394c7653ed2eeccee713c.tar.gz frameworks_av-de98d9b7c19882dd8c3394c7653ed2eeccee713c.tar.bz2 | |
fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72
am: 9950df2504
* commit '9950df2504daeb1bde86603065ef072155e48ecf':
fix possible overflow in effect wrappers.
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, 8 insertions, 2 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index af904a6..14a1a74 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -3091,7 +3091,10 @@ 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 a48a4e3..4dc8b45 100644 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -1956,7 +1956,10 @@ 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 || |