commit a272dd772afbc7da3f4bf9b548000d9987f705fc
author Lajos Molnar <lajos@google.com> Wed May 25 11:05:08 2022 -0700
committer Lajos Molnar <lajos@google.com> Wed May 25 17:12:35 2022 -0700
tree 4f165b062928cea8b773c92703b6baa83a01efc9
parent 2d222b8fca983b62398ffc165e098fb564aa838e

codec2: remove assertions when marshalling fences

These can be exploited by malicious apps.

Bug: 222463114
Change-Id: Ie0127b8b26f61dd53c016a9eaa4ebfdc664833e0

media/codec2/vndk/C2Fence.cpp

diff --git a/media/codec2/vndk/C2Fence.cpp b/media/codec2/vndk/C2Fence.cpp
index 6f98d11..0b556aa 100644
--- a/media/codec2/vndk/C2Fence.cpp
+++ b/media/codec2/vndk/C2Fence.cpp
@@ -148,7 +148,7 @@
     }
 
     virtual native_handle_t *createNativeHandle() const {
-        ALOG_ASSERT(false, "Cannot create native handle from surface fence");
+        ALOGD("Cannot create native handle from surface fence");
         return nullptr;
     }
 
@@ -287,7 +287,8 @@
             p = SyncFenceImpl::CreateFromNativeHandle(handle);
             break;
         default:
-            ALOG_ASSERT(false, "Unsupported fence type %d", type);
+            ALOGD("Unsupported fence type %d", type);
+            // return a null-fence in this case
             break;
     }
     if (p && !p->valid()) {