diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:20 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:20 -0800 |
| commit | edd6ca3e244dda4687da86bc614a2bb709b3a963 (patch) | |
| tree | 4efd0f4664f7f5e88434844c2eb70cdff4aab5d1 /media/libeffects | |
| parent | 808632f7bf0a897fb55cc38170ad6c1b2fd86ba2 (diff) | |
| parent | 38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b (diff) | |
| download | frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.zip frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.tar.gz frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.tar.bz2 | |
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17
Ticket: CYNGNOS-1854
Diffstat (limited to 'media/libeffects')
| -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 e01c414..f0afd39 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -3104,7 +3104,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 || |