Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 722c3a9
Fix child process handling in scripts.c and lua_scripts.c
Alex Richardson committed 5 years ago
commit 722c3a98456b0e4e2bd0aaa8621e6a5fce1cabc6
parent c2118f0
2 files changed +51 -9
modified libpkg/lua_scripts.c
@@ -226,6 +226,7 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
#endif

	struct pollfd pfd;

	int cur_pipe[2];
+ 
	bool should_waitpid;

	char *line = NULL;

	FILE *f;

	ssize_t linecap = 0;
@@ -302,16 +303,33 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
		pfd.events = POLLIN | POLLERR | POLLHUP;



		f = fdopen(pfd.fd, "r");
+ 
		should_waitpid = true;

		for (;;) {
+ 
			errno = 0;

			int pres = poll(&pfd, 1, 1000);

			if (pres == -1) {
- 
				if (errno == EINTR)
+ 
				if (errno == EINTR) {

					continue;
- 
				else
+ 
				} else {
+ 
					pkg_emit_error("poll() failed: %s",
+ 
					    strerror(errno));
+ 
					ret = EPKG_FATAL;

					goto cleanup;
+ 
				}

			}

			if (pres == 0) {
- 
				if (waitpid(pid, NULL, WNOHANG | WNOWAIT) > 0) {
+ 
				pid_t p;
+ 
				assert(should_waitpid);
+ 
				while ((p = waitpid(pid, &pstat, WNOHANG)) == -1) {
+ 
					if (errno != EINTR) {
+ 
						pkg_emit_error("waitpid() "
+ 
						    "failed: %s", strerror(errno));
+ 
						ret = EPKG_FATAL;
+ 
						goto cleanup;
+ 
					}
+ 
				}
+ 
				if (p > 0) {
+ 
					should_waitpid = false;

					break;

				}

				continue;
@@ -325,8 +343,10 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
		}

		fclose(f);
- 
		while (waitpid(pid, &pstat, 0) == -1) {
+ 
		while (should_waitpid && waitpid(pid, &pstat, 0) == -1) {

			if (errno != EINTR) {
+ 
				pkg_emit_error("waitpid() failed: %s",
+ 
				    strerror(errno));

				ret = EPKG_FATAL;

				goto cleanup;

			}
modified libpkg/scripts.c
@@ -77,6 +77,7 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
	struct procctl_reaper_kill killemall;

#endif

	struct pollfd pfd;
+ 
	bool should_waitpid;

	ssize_t linecap = 0;

	char *line = NULL;

	FILE *f;
@@ -244,16 +245,33 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
			pfd.events = POLLIN | POLLERR | POLLHUP;



			f = fdopen(pfd.fd, "r");
+ 
			should_waitpid = true;

			for (;;) {
+ 
				errno = 0;

				int pres = poll(&pfd, 1, 1000);

				if (pres == -1) {
- 
					if (errno == EINTR)
+ 
					if (errno == EINTR) {

						continue;
- 
					else
+ 
					} else {
+ 
						pkg_emit_error("poll() "
+ 
						    "failed: %s", strerror(errno));
+ 
						ret = EPKG_FATAL;

						goto cleanup;
+ 
					}

				}

				if (pres == 0) {
- 
					if (waitpid(pid, NULL, WNOHANG | WNOWAIT) > 0) {
+ 
					pid_t p;
+ 
					assert(should_waitpid);
+ 
					while ((p = waitpid(pid, &pstat, WNOHANG)) == -1) {
+ 
						if (errno != EINTR) {
+ 
							pkg_emit_error("waitpid() "
+ 
							    "failed: %s", strerror(errno));
+ 
							ret = EPKG_FATAL;
+ 
							goto cleanup;
+ 
						}
+ 
					}
+ 
					if (p > 0) {
+ 
						should_waitpid = false;

						break;

					}

					continue;
@@ -267,9 +285,13 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
			}

			fclose(f);
- 
			while (waitpid(pid, &pstat, 0) == -1) {
- 
				if (errno != EINTR)
+ 
			while (should_waitpid && waitpid(pid, &pstat, 0) == -1) {
+ 
				if (errno != EINTR) {
+ 
					pkg_emit_error("waitpid() failed: %s",
+ 
					    strerror(errno));
+ 
					ret = EPKG_FATAL;

					goto cleanup;
+ 
				}

			}



			if (WEXITSTATUS(pstat) != 0) {