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

Commit 0d6d397f authored by Wanja Schulze's avatar Wanja Schulze Committed by Tim Schumacher
Browse files

OMXNodeInstance: Allow skipping CVE-2017-13154 

This commit breaks the audio and/or video playback on some devices.

Wrap into #ifndef/#endif statement to allow skipping this patch
for specific devices by adding the following directive into the
BoardConfig.mk or BoardConfigCommon.mk file of the device repo:
  BOARD_SKIP_CVE_2017_13154 := true

cm-11.0: Use a Boardflag instead of a global C/C++ flag

Change-Id: I9796dc5b1389668c33e7aebbe703baa1244192c8
parent da55df40

media/libstagefright/omx/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ ifeq ($(BOARD_USES_PROPRIETARY_OMX),SAMSUNG) 
LOCAL_CFLAGS     += -DSAMSUNG_OMX

endif



ifeq ($(BOARD_SKIP_CVE_2017_13154),true)

LOCAL_CFLAGS     += -DSKIP_CVE_2017_13154

endif



LOCAL_MODULE:= libstagefright_omx



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/omx/OMXNodeInstance.cpp

+2 −0
Original line number Diff line number Diff line
@@ -266,7 +266,9 @@ status_t OMXNodeInstance::freeNode(OMXMaster *master) { 
            break;

    }



#ifndef SKIP_CVE_2017_13154

    Mutex::Autolock _l(mLock);

#endif



    ALOGV("calling destroyComponentInstance");

    OMX_ERRORTYPE err = master->destroyComponentInstance(