This reverts commit 19d12edc1aad955ecd2e2b1bc786f1e7acb5fe0c. It was causing lots of programs to crash in Replicant and made booting significantly longer. Reverting this commit is not ideal but because we currently don't know how to fix this properly at least by reverting this commit we can release other security issue fixes in the Replicant 6.0 0004 release.
This is an excerpt from the backtrace of one of the crashes that happened because of this commit: F DEBUG : #00 pc 00046248 /system/lib/libc.so (tgkill+12) F DEBUG : #01 pc 00043d01 /system/lib/libc.so (pthread_kill+32) F DEBUG : #02 pc 0001bd73 /system/lib/libc.so (raise+10) F DEBUG : #03 pc 00018c03 /system/lib/libc.so (__libc_android_abort+42) F DEBUG : #04 pc 000167ec /system/lib/libc.so (abort+4) F DEBUG : #05 pc 0001a763 /system/lib/libc.so (__libc_fatal+26) F DEBUG : #06 pc 0002f50d /system/lib/libc.so (__bionic_heap_corruption_error+8) F DEBUG : #07 pc 0003173b /system/lib/libc.so (dlfree+310) F DEBUG : #08 pc 0000e9bb /system/lib/libutils.so (_ZNK7android7RefBase9decStrongEPKv+50) F DEBUG : #09 pc 0001936f /system/lib/libstagefright_omx.so Signed-off-by: Joonas Kylmälä <joonas.kylm...@iki.fi> --- media/libstagefright/omx/OMXNodeInstance.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 6f1ba9b6b..04d0b258a 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -378,10 +378,6 @@ status_t OMXNodeInstance::freeNode(OMXMaster *master) { break; } -#ifndef SKIP_CVE_2017_13154 - Mutex::Autolock _l(mLock); -#endif - ALOGV("[%x:%s] calling destroyComponentInstance", mNodeID, mName); OMX_ERRORTYPE err = master->destroyComponentInstance( static_cast<OMX_COMPONENTTYPE *>(mHandle)); -- 2.11.0 _______________________________________________ Replicant mailing list Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant