Merge pull request #3887 from simondeziel/closedir

initutils: close dirfd in error path

Merge pull request #3887 from simondeziel/closedir
fda9bfb7 · Christian Brauner · GitHub · 804f3e2a · 9884f0a6 · fda9bfb7
Unverified Commit fda9bfb7 authored Jun 30, 2021 by Christian Brauner Committed by GitHub Jun 30, 2021
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

initutils.c src/lxc/initutils.c +3 -1

No files found.
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -458,8 +458,10 @@ restart:
 		if (fd == STDERR_FILENO || fd == fddir)
 			break;

-		if (close(fd))
+		if (close(fd)) {
+			closedir(dir);
 			return -errno;
+		}

 		closedir(dir);
 		goto restart;