diff options
| author | Aalique Grahame <agrahame@codeaurora.org> | 2017-03-22 15:12:59 -0700 |
|---|---|---|
| committer | MSe <mse1969@posteo.de> | 2017-09-16 23:04:46 +0200 |
| commit | 667f724c8ce75615381601667f222f8eb8d7619d (patch) | |
| tree | 181b42830fc4e36f13f8c2f2186af97d76ba8dc8 | |
| parent | ebad67f1f1c99a43cb6725c0e3f176306bc6931a (diff) | |
| download | android_hardware_qcom_audio-cm-13.0-caf-8996.tar.gz android_hardware_qcom_audio-cm-13.0-caf-8996.tar.bz2 android_hardware_qcom_audio-cm-13.0-caf-8996.zip | |
aenc-aac: bounds checkingcm-13.0-caf-8996
Add bounds checking for buffers
CRs-Fixed: 2013236
Change-Id: I0e1f75ea307088b92e87b99f8b614afbcd0f1c82
CVE-2017-8278
| -rw-r--r-- | mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp index f53f9fdd..06d821a7 100644 --- a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp +++ b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp @@ -4176,14 +4176,25 @@ OMX_ERRORTYPE omx_aac_aenc::fill_this_buffer_proxy DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\ buffer->nAllocLen,m_tmp_out_meta_buf, nReadbytes,nNumOutputBuf); - if(*m_tmp_out_meta_buf <= 0) + if(m_tmp_out_meta_buf == NULL) + return OMX_ErrorUndefined; + + if(*m_tmp_out_meta_buf <= 0 || *m_tmp_out_meta_buf > CHAR_MAX) return OMX_ErrorBadParameter; - szadifhr = AUDAAC_MAX_ADIF_HEADER_LENGTH; + szadifhr = AUDAAC_MAX_ADIF_HEADER_LENGTH; numframes = *m_tmp_out_meta_buf; metainfo = (int)((sizeof(ENC_META_OUT) * numframes)+ - sizeof(unsigned char)); + sizeof(unsigned char)); + /* + * add bounds checking + */ + if ((metainfo > INT_MAX - szadifhr) || + (buffer->nAllocLen < (nReadbytes + szadifhr)) || + (metainfo > nReadbytes)) { + return OMX_ErrorBadParameter; + } audaac_rec_install_adif_header_variable(0,sample_idx, - (OMX_U8)m_aac_param.nChannels); + (OMX_U8)m_aac_param.nChannels); memcpy(buffer->pBuffer,m_tmp_out_meta_buf,metainfo); memcpy(buffer->pBuffer + metainfo,&audaac_header_adif[0],szadifhr); memcpy(buffer->pBuffer + metainfo + szadifhr, |