diff options
| author | Joonas Kylmälä <joonas.kylmala@iki.fi> | 2019-10-20 01:08:09 +0300 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-03 18:32:25 +0100 |
| commit | 8eac8a5acd7bcda848135e33452c15980d8d3731 (patch) | |
| tree | ead8079d7efa0681a51992480a03707a80c56554 | |
| parent | a16ccffd6941c0761a32f9bba78d4a83d3d8e3a9 (diff) | |
| download | frameworks_av-replicant-6.0.tar.gz frameworks_av-replicant-6.0.tar.bz2 frameworks_av-replicant-6.0.zip | |
Revert "Backport: OMXNodeInstance: use a lock around OMX::freeNode"HEADreplicant-6.0
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.kylmala@iki.fi>
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 6f1ba9b6bb..04d0b258aa 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)); |