From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 24 Aug 2011 09:40:21 +0000 (+0200)
Subject: cgrulesengd: Fixed closing of daemon sockets on error
X-Git-Tag: v0.38~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d4288179cbf7b4fd7837aa1d0cd9374828b313;p=thirdparty%2Flibcgroup.git

cgrulesengd: Fixed closing of daemon sockets on error

When socket() fails, it returns -1 instead of file descriptor and we might pass
this -1 to close() in close_and_exit label -> unexpected result.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 2f42a57b..ff729651 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -722,9 +722,9 @@ static int cgre_create_netlink_socket_process_msg(void)
 	}
 
 close_and_exit:
-	if (sk_nl)
+	if (sk_nl > 0)
 		close(sk_nl);
-	if (sk_unix)
+	if (sk_unix > 0)
 		close(sk_unix);
 	return rc;
 }