diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-03-22 15:22:45 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-03-22 18:11:27 +0100 |
commit | e4077ff6f3e6755a9858f2c10441121b37b7c766 (patch) | |
tree | c246d7cd1793283ccd4f59022274579515256373 /src/nspawn | |
parent | 094eecd29d350e178107cfd786b2a80f4f0c0c3a (diff) | |
download | systemd-e4077ff6f3e6755a9858f2c10441121b37b7c766.tar.gz |
nspawn: don't free "fds" twice
Previously both run() and run_container() would free 'fds'. Let's fix
that, and let run() free it but make run_container() already remove all
fds from it, because that's what we actually want to do.
Fixes: #12073
Diffstat (limited to 'src/nspawn')
-rw-r--r-- | src/nspawn/nspawn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index dfc4f68ede..ee930972ad 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -4212,7 +4212,7 @@ static int run_container(int master, barrier_set_role(&barrier, BARRIER_PARENT); - fds = fdset_free(fds); + fdset_close(fds); kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]); rtnl_socket_pair[1] = safe_close(rtnl_socket_pair[1]); |