commit f076b4d3ab9b56f9ee2316f6df2898d0a13ce517
author Vinson Lee <vlee@freedesktop.org> Mon Nov 16 16:23:47 2020 -0800
committer Dylan Baker <dylan.c.baker@intel.com> Tue Nov 17 10:57:32 2020 -0800
tree 87a91367052a931eb52ac31ff0783efec3b1c1c7
parent f6a73228a47915e703afcc1e13b8a9b752504c36

turnip: Close sync_fd only if it is a valid file descriptor.

Fix defects reported by Coverity Scan.

Argument cannot be negative (NEGATIVE_RETURNS)
negative_returns: sync_fd is passed to a parameter that cannot be negative.

Fixes: cec0bc73e55 ("turnip: rework fences to use syncobjs")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7647>
(cherry picked from commit 69cad1f96ef4481cc2395def9c993ddcbb0e2540)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index a53dfb0..06eab24 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -463,7 +463,7 @@
         "description": "turnip: Close sync_fd only if it is a valid file descriptor.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "cec0bc73e550859635a71d330625bccdf71e87ee"
     },

src/freedreno/vulkan/tu_wsi_display.c

diff --git a/src/freedreno/vulkan/tu_wsi_display.c b/src/freedreno/vulkan/tu_wsi_display.c
index 1ac1b7d..9227ca6 100644
--- a/src/freedreno/vulkan/tu_wsi_display.c
+++ b/src/freedreno/vulkan/tu_wsi_display.c
@@ -282,12 +282,12 @@
                                       allocator,
                                       NULL,
                                       sync_fd);
+
+      close(sync_fd);
    } else {
       ret = VK_ERROR_OUT_OF_HOST_MEMORY;
    }
 
-   close(sync_fd);
-
    if (ret != VK_SUCCESS)
       tu_DestroyFence(_device, *_fence, allocator);
 
@@ -319,12 +319,12 @@
                                        allocator,
                                        NULL,
                                        sync_fd);
+
+      close(sync_fd);
    } else {
       ret = VK_ERROR_OUT_OF_HOST_MEMORY;
    }
 
-   close(sync_fd);
-
    if (ret != VK_SUCCESS)
       tu_DestroyFence(_device, *_fence, allocator);