diff options
| author | Eric Laurent <elaurent@google.com> | 2016-01-12 01:58:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-12 01:58:50 +0000 |
| commit | 3a9d4f4a83341e4c083aa50a651fe5d765ef70ad (patch) | |
| tree | 167fc6e0e51a5eaea14f37e87074f27dc3f97ac4 /media | |
| parent | c56555962b7e0fcee2dc0a058127f8f309f19ea8 (diff) | |
| parent | baebc739b0fe7257b26bfe105b67409559171c82 (diff) | |
| download | frameworks_av-3a9d4f4a83341e4c083aa50a651fe5d765ef70ad.zip frameworks_av-3a9d4f4a83341e4c083aa50a651fe5d765ef70ad.tar.gz frameworks_av-3a9d4f4a83341e4c083aa50a651fe5d765ef70ad.tar.bz2 | |
fix possible overflow in effect wrappers. am: 9e29523b95
am: baebc739b0
* commit 'baebc739b0fe7257b26bfe105b67409559171c82':
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 aa41252..ea72e69 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -3026,7 +3026,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 || |