{commands,start}: remove element from list first

First remove the client from the list then close the fd. Otherwise we open ourselves to a race where another codepath might be writing to a bad file descriptor. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

{commands,start}: remove element from list first
7669dc34 · Christian Brauner · 96f0cf3b · 7669dc34 · 7669dc34
Unverified Commit 7669dc34 authored Feb 18, 2018 by Christian Brauner
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

commands.c src/lxc/commands.c +1 -1

start.c src/lxc/start.c +1 -1

No files found.
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1021,8 +1021,8 @@ static void lxc_cmd_fd_cleanup(int fd, struct lxc_handler *handler,
 			continue;
 		/* kick client from list */
-		close(client->clientfd);
 		lxc_list_del(cur);
+		close(client->clientfd);
 		free(cur->elem);
 		free(cur);
 		/* No need to walk the whole list. If we found the state client

--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -418,8 +418,8 @@ int lxc_serve_state_clients(const char *name, struct lxc_handler *handler,
 		}
 		/* kick client from list */
-		close(client->clientfd);
 		lxc_list_del(cur);
+		close(client->clientfd);
 		free(cur->elem);
 		free(cur);
 	}