From 05a8b3305f88fff91b14fd6417f74e1b5b7388b3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Feb 2018 20:51:04 +0100
Subject: [PATCH] nspawn: close pipe on error

---
 src/nspawn/nspawn-setuid.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index c4ad1725122..46cdcd2e843 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -48,11 +48,13 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
                 return log_error_errno(errno, "Failed to allocate pipe: %m");
 
         r = safe_fork("(getent)", FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_LOG, &pid);
-        if (r < 0)
+        if (r < 0) {
+                safe_close_pair(pipe_fds);
                 return r;
+        }
         if (r == 0) {
-                int nullfd;
                 char *empty_env = NULL;
+                int nullfd;
 
                 if (dup3(pipe_fds[1], STDOUT_FILENO, 0) < 0)
                         _exit(EXIT_FAILURE);
-- 
2.47.3