Merge pull request #3280 from Piscolero/state_client_socket_leak_fix

src/lxc/commands.c

@@ -863,7 +863,7 @@ int lxc_cmd_add_state_client(const char *name, const char *lxcpath,
 	return MAX_STATE;
 }
 
-static int lxc_cmd_add_state_client_callback(int fd, struct lxc_cmd_req *req,
+static int lxc_cmd_add_state_client_callback(__owns int fd, struct lxc_cmd_req *req,
 					     struct lxc_handler *handler,
 					     struct lxc_epoll_descr *descr)
 {
@@ -889,6 +889,10 @@ static int lxc_cmd_add_state_client_callback(int fd, struct lxc_cmd_req *req,
 	if (ret < 0)
 		goto reap_client_fd;
 
+	/* close fd if state is already achieved to avoid leakage */
+	if (rsp.ret != MAX_STATE)
+		close(fd);
+
 	return 0;
 
 reap_client_fd:

src/lxc/compiler.h

@@ -52,6 +52,9 @@
 #define __lxc_unused
 #endif
 
+/* Indicates taking ownership */
+#define __owns
+
 #define __cgfsng_ops
 
 #endif /* __LXC_COMPILER_H */