diff options
| author | Aalique Grahame <agrahame@codeaurora.org> | 2017-03-22 15:12:59 -0700 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2019-09-28 00:23:56 +0200 |
| commit | 027d30204dcadcd86321058783276c6530c49021 (patch) | |
| tree | 5d92ef9869e3324b8dca8835d55ba456a709f085 | |
| parent | 9d78a156b8e0b92fd2bb0b91703fbf1a21df2643 (diff) | |
| download | hardware_qcom_audio-027d30204dcadcd86321058783276c6530c49021.tar.gz hardware_qcom_audio-027d30204dcadcd86321058783276c6530c49021.tar.bz2 hardware_qcom_audio-027d30204dcadcd86321058783276c6530c49021.zip | |
aenc-aac: bounds checking
Add bounds checking for buffers
CRs-Fixed: 2013236
Change-Id: I0e1f75ea307088b92e87b99f8b614afbcd0f1c82
(cherry picked from commit 9d1af8a2a985bd5e32209235cefd12b04b304527)
| -rw-r--r-- | mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp | 23 |
1 files changed, 17 insertions, 6 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 33892b55..b1504077 100644 --- a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp +++ b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. +Copyright (c) 2010-2014, 2017 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -4152,14 +4152,25 @@ OMX_ERRORTYPE omx_aac_aenc::fill_this_buffer_proxy DEBUG_DETAIL("FTBP->Al_len[%d]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 = ((sizeof(ENC_META_OUT) * numframes)+ - sizeof(unsigned char)); + metainfo = (int)((sizeof(ENC_META_OUT) * numframes)+ + 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, - 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, |