commit 86514177541d2a930de0427812a65f9d15f5bc32
author Naseer Ahmed <naseer@codeaurora.org> Wed Mar 29 10:07:43 2017 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Mon Apr 24 12:31:19 2017 -0400
tree f8aa7ac2daec9daf95b904ec7381f780a8bb8abc
parent 1a0ae7aeef67a49229d80f8acffb490b6475fee4

gralloc1: Close acquire_fence in lock

Bug: 36612621
CRs-Fixed: 2037669
Change-Id: I2069e828eedad0c0c23e6cd7ba05d26d7a2f2612

libgralloc1/gr_device_impl.cpp

diff --git a/libgralloc1/gr_device_impl.cpp b/libgralloc1/gr_device_impl.cpp
index 08173e8..98ce595 100644
--- a/libgralloc1/gr_device_impl.cpp
+++ b/libgralloc1/gr_device_impl.cpp
@@ -409,14 +409,26 @@
   return status;
 }
 
+static inline void CloseFdIfValid(int fd) {
+  if (fd > 0) {
+    close(fd);
+  }
+}
+
 gralloc1_error_t GrallocImpl::LockBuffer(gralloc1_device_t *device, buffer_handle_t buffer,
                                          gralloc1_producer_usage_t prod_usage,
                                          gralloc1_consumer_usage_t cons_usage,
                                          const gralloc1_rect_t *region, void **out_data,
                                          int32_t acquire_fence) {
   gralloc1_error_t status = CheckDeviceAndHandle(device, buffer);
-  if (status == GRALLOC1_ERROR_NONE && (acquire_fence > 0)) {
+  if (status != GRALLOC1_ERROR_NONE) {
+    CloseFdIfValid(acquire_fence);
+    return status;
+  }
+
+  if (acquire_fence > 0) {
     int error = sync_wait(acquire_fence, 1000);
+    CloseFdIfValid(acquire_fence);
     if (error < 0) {
       ALOGE("%s: sync_wait timedout! error = %s", __FUNCTION__, strerror(errno));
       return GRALLOC1_ERROR_UNDEFINED;