commit a26d082276ad7e5dad16cab8cd1362b79135f735
author Chia-I Wu <olv@google.com> Fri Dec 22 11:16:38 2017 -0800
committer Chia-I Wu <olv@google.com> Fri Dec 22 11:20:08 2017 -0800
tree b34b987e5af450f9456304de401015d9ae11fc1b
parent fef3803ba90825ac8bc9fb210152ca974040e816

surfaceflinger: fix fence fd double close

The unique_fd in BufferLayerConsumer::syncForReleaseLocked is
wrapped in a Fence immediately.  We should not let both own the
fence fd.

Bug: 70976329
Bug: 70982313
Test: manual
Change-Id: Ib4d6bce8519f1b026c59fdfd0e57f93920025b0c

services/surfaceflinger/BufferLayerConsumer.cpp

diff --git a/services/surfaceflinger/BufferLayerConsumer.cpp b/services/surfaceflinger/BufferLayerConsumer.cpp
index e39ebcc..16c3254 100644
--- a/services/surfaceflinger/BufferLayerConsumer.cpp
+++ b/services/surfaceflinger/BufferLayerConsumer.cpp
@@ -392,7 +392,7 @@
 
     if (mCurrentTexture != BufferQueue::INVALID_BUFFER_SLOT) {
         if (SyncFeatures::getInstance().useNativeFenceSync()) {
-            base::unique_fd fenceFd = mRE.flush();
+            int fenceFd = mRE.flush().release();
             if (fenceFd == -1) {
                 BLC_LOGE("syncForReleaseLocked: failed to flush RenderEngine");
                 return UNKNOWN_ERROR;