Low: ipc_socket: Fixes fd leak in socket ipc client disconnection

ClusterLabs · Sep 16, 2013 · b327dbe · b327dbe
1 parent e166f88
commit b327dbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/ipc_shm.c b/lib/ipc_shm.c
@@ -39,6 +39,7 @@
 static void
 qb_ipcc_shm_disconnect(struct qb_ipcc_connection *c)
 {
+	qb_ipcc_us_sock_close(c->setup.u.us.sock);
 	if (c->is_connected) {
 		qb_rb_close(c->request.u.shm.rb);
 		qb_rb_close(c->response.u.shm.rb);

diff --git a/lib/ipc_socket.c b/lib/ipc_socket.c
@@ -281,8 +281,9 @@ qb_ipcc_us_disconnect(struct qb_ipcc_connection *c)
 {
 	munmap(c->request.u.us.shared_data, SHM_CONTROL_SIZE);
 	unlink(c->request.u.us.shared_file_name);
-	close(c->request.u.us.sock);
-	close(c->event.u.us.sock);
+	qb_ipcc_us_sock_close(c->event.u.us.sock);
+	qb_ipcc_us_sock_close(c->request.u.us.sock);
+	qb_ipcc_us_sock_close(c->setup.u.us.sock);
 }
 
 static ssize_t

diff --git a/lib/ipcc.c b/lib/ipcc.c
@@ -383,7 +383,6 @@ qb_ipcc_disconnect(struct qb_ipcc_connection *c)
 
 	ow = _event_sock_one_way_get(c);
 	(void)_check_connection_state_with(c, -EAGAIN, ow, 0, POLLIN);
-	qb_ipcc_us_sock_close(ow->u.us.sock);
 
 	if (c->funcs.disconnect) {
 		c->funcs.disconnect(c);