Mesa (master): util: fix possible fd leaks in os_socket_listen_abstract

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: eac0ba7fc193cceccd953bc4726ceef750b18085
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eac0ba7fc193cceccd953bc4726ceef750b18085

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Fri Jul 24 17:51:25 2020 +0200

util: fix possible fd leaks in os_socket_listen_abstract

Found by Coverity.

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Fixes: ef5266ebd50 ("util/os_socket: Add socket related functions.")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6067>

---

 src/util/os_socket.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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;
 }