From 5c7f933dcc3866229729b88c20a82a2ccc62b844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Mon, 16 Feb 2015 22:42:01 +0100 Subject: [PATCH] Fix file descriptor leakage #30724 --- server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server.c b/server.c index fab8387..9c63663 100644 --- a/server.c +++ b/server.c @@ -39,16 +39,18 @@ static int server_create_socket(const char *name) { return -1; socklen_t socklen = offsetof(struct sockaddr_un, sun_path) + strlen(sockaddr.sun_path) + 1; mode_t mode = S_IRUSR|S_IWUSR; - fchmod(fd, mode); + if (fchmod(fd, mode) == -1) + goto error; if (bind(fd, (struct sockaddr*)&sockaddr, socklen) == -1) return -1; - if (fchmod(fd, mode) == -1 && chmod(sockaddr.sun_path, mode) == -1) + if (fchmod(fd, mode) == -1 || chmod(sockaddr.sun_path, mode) == -1) goto error; if (listen(fd, 5) == -1) goto error; return fd; error: unlink(sockaddr.sun_path); + close(fd); return -1; }