From: Marco d'Itri <md@Linux.IT>
Date: Sun, 27 Aug 2006 00:53:16 +0000 (+0200)
Subject: run_program: close pipe fd's which are connected to child process
X-Git-Tag: 174~2162
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b83b299141ccbe2b60cf49a766a540c43f32167c

run_program: close pipe fd's which are connected to child process

When udev_log="debug", the children of udev inherit the file
descriptors of the pipes used to capture output. If they are not
properly closed then udev will not exit until all programs started
in the background by the children are terminated or have closed the
fds themselves, and this may cause deadlocks with udevsettle.
---

diff --git a/udev_utils_run.c b/udev_utils_run.c
index 76a704c52..2771861cf 100644
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -151,10 +151,14 @@ int run_program(const char *command, const char *subsystem,
 			close(devnull);
 		} else
 			err("open /dev/null failed: %s", strerror(errno));
-		if (outpipe[WRITE_END] > 0)
+		if (outpipe[WRITE_END] > 0) {
 			dup2(outpipe[WRITE_END], STDOUT_FILENO);
-		if (errpipe[WRITE_END] > 0)
+			close(outpipe[WRITE_END]);
+		}
+		if (errpipe[WRITE_END] > 0) {
 			dup2(errpipe[WRITE_END], STDERR_FILENO);
+			close(errpipe[WRITE_END]);
+		}
 		execv(argv[0], argv);
 
 		/* we should never reach this */