Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 691c9170 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

OMXNodeInstance: Allow dynamic native handle for shared mem buffer 

* Change Ief2d2d4d0445074c0ecdc723b1b25997a7631389, part of Aug 2018
  ASB, authored to mitigate CVE-2018-9427, restricted useBuffer()
  based on buffer type and port mode.
* Follow-up change I1e4eb72e070f4e60ff4df94f9b9d161361828477 allowed
  dynamic handles for input buffers, but not a *native* handle for
  this specific buffer type.
* Some of our devices using legacy HAL1 recording require this
  combination of buffer type and port mode, so allow when explicitly
  requested.

Change-Id: I15f8cbb3956773e2ba97032203f5e9254505d8ac
parent f1f657bb

media/libstagefright/omx/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ cc_library_shared { 


    product_variables: {

        lineage: {

            needs_legacy_camera_hal1_dyn_native_handle: {

                cppflags: ["-DNEEDS_LEGACY_CAMERA_HAL1_DYN_NATIVE_HANDLE"],

            },

            uses_qcom_bsp_legacy: {

                cppflags: ["-DQCOM_BSP_LEGACY"],

            },

media/libstagefright/omx/OMXNodeInstance.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1081,6 +1081,9 @@ status_t OMXNodeInstance::useBuffer( 


        case OMXBuffer::kBufferTypeSharedMem: {

            if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer

#ifdef NEEDS_LEGACY_CAMERA_HAL1_DYN_NATIVE_HANDLE

                    && mPortMode[portIndex] != IOMX::kPortModeDynamicNativeHandle

#endif

                    && mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) {

                break;

            }