diff options
| author | Mahesh Lanka <mlanka@codeaurora.org> | 2016-10-12 15:08:26 +0530 |
|---|---|---|
| committer | SteadyQuad <SteadyQuad@gmail.com> | 2016-12-13 22:54:17 +0100 |
| commit | 1608b66ac343c78cfab67a4cfc2017bec2d41fcd (patch) | |
| tree | ded2c4e1c5901b8c149ada5a0214d266797e97bd | |
| parent | 23cd92cf8c0bd4908ff0b3f64aa108aa28c089f3 (diff) | |
| download | android_hardware_qcom_media-1608b66ac343c78cfab67a4cfc2017bec2d41fcd.tar.gz android_hardware_qcom_media-1608b66ac343c78cfab67a4cfc2017bec2d41fcd.tar.bz2 android_hardware_qcom_media-1608b66ac343c78cfab67a4cfc2017bec2d41fcd.zip | |
mm-video-v4l2: vdec: Disallow input usebuffer for secure case
In secure mode, input buffer _must_ be allocated by the component to
allocate a secure buffer.
Client-supplied memory via usebuffer does not qualify as secure-memory
and must be rejected. This also avoids accidental heap-overflow while
copying bitstream from user-memory to a smaller-sized secure-payload
(usually the buffer-header itself)
Bug : 30148882
Fixes : Heap Overflow/LPE in MediaServer (libOmxVdec problem #11)
Change-Id: I113c771adccc81869c9e044e395abb918c7f5890
(cherry picked from commit d51985695dd8e3e771559ef503a33bda62b36e52)
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index b4993b16..0f3284b5 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -4128,6 +4128,12 @@ OMX_ERRORTYPE omx_vdec::use_input_heap_buffers( { DEBUG_PRINT_LOW("Inside %s, %p\n", __FUNCTION__, buffer); OMX_ERRORTYPE eRet = OMX_ErrorNone; + + if (secure_mode) { + DEBUG_PRINT_ERROR("use_input_heap_buffers is not allowed in secure mode"); + return OMX_ErrorUndefined; + } + if (!m_inp_heap_ptr) m_inp_heap_ptr = (OMX_BUFFERHEADERTYPE*) calloc( (sizeof(OMX_BUFFERHEADERTYPE)), @@ -5377,7 +5383,7 @@ OMX_ERRORTYPE omx_vdec::empty_this_buffer_proxy(OMX_IN OMX_HANDLETYPE h /*for use buffer we need to memcpy the data*/ temp_buffer->buffer_len = buffer->nFilledLen; - if (input_use_buffer && temp_buffer->bufferaddr) { + if (input_use_buffer && temp_buffer->bufferaddr && !secure_mode) { if (buffer->nFilledLen <= temp_buffer->buffer_len) { if (arbitrary_bytes) { memcpy (temp_buffer->bufferaddr, (buffer->pBuffer + buffer->nOffset),buffer->nFilledLen); |