From 75e81ff0d7720d3167039593e6af8391d776b25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Fri, 24 Jul 2020 17:51:25 +0200
Subject: [PATCH] util: fix possible fd leaks in os_socket_listen_abstract
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Found by Coverity.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Fixes: ef5266ebd50 ("util/os_socket: Add socket related functions.")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6067>
(cherry picked from commit eac0ba7fc193cceccd953bc4726ceef750b18085)
---
 .pick_status.json    | 2 +-
 src/util/os_socket.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 168032fa74a..6e326aa505b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1822,7 +1822,7 @@
         "description": "util: fix possible fd leaks in os_socket_listen_abstract",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "ef5266ebd50e7fa65c56bdb623e12ca8c233b470"
     },
diff --git a/src/util/os_socket.c b/src/util/os_socket.c
index 98ef013205e..6562cccaddd 100644
--- a/src/util/os_socket.c
+++ b/src/util/os_socket.c
@@ -33,10 +33,15 @@ os_socket_listen_abstract(const char *path, int count)
    int ret = bind(s, (struct sockaddr*)&addr,
                   offsetof(struct sockaddr_un, sun_path) +
                   strlen(path) + 1);
-   if (ret < 0)
+   if (ret < 0) {
+      close(s);
       return -1;
+   }
 
-   listen(s, count);
+   if (listen(s, count) < 0) {
+      close(s);
+      return -1;
+   }
 
    return s;
 }