Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dd0732c
Prevent scripts to leave process behind themselves
Baptiste Daroussin committed 11 years ago
commit dd0732c1747c472ed7899a025fbc8eabd5f04227
parent 86eb3b7
2 files changed +24 -0
modified configure.ac
@@ -144,6 +144,7 @@ AC_CHECK_HEADERS_ONCE([bsd/libutil.h])
AC_CHECK_HEADERS_ONCE([bsd/err.h])

AC_CHECK_HEADERS_ONCE([bsd/unistd.h])

AC_CHECK_HEADERS_ONCE([bsd/sys/cdefs.h])
+ 
AC_CHECK_HEADERS_ONCE([sys/procctl.h])



AC_CHECK_HEADER([regex.h], [

	AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if you have the <regex.h> header file.])
modified libpkg/scripts.c
@@ -26,7 +26,12 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
+ 
#include "pkg_config.h"
+ 


#include <sys/wait.h>
+ 
#ifdef HAVE_SYS_PROCCTL_H
+ 
#include <sys/procctl.h>
+ 
#endif



#include <assert.h>

#include <errno.h>
@@ -60,6 +65,10 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)
	ssize_t bytes_written;

	size_t script_cmd_len;

	long argmax;
+ 
#ifdef PROC_REAP_KILL
+ 
	struct procctl_reaper_status info;
+ 
	struct procctl_reaper_kill killemall;
+ 
#endif



	struct {

		const char * const arg;
@@ -85,6 +94,9 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)


	assert(i < sizeof(map) / sizeof(map[0]));
+ 
#ifdef PROC_REAP_KILL
+ 
	procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL);
+ 
#endif

	for (j = 0; j < PKG_NUM_SCRIPTS; j++) {

		if (pkg_script_get(pkg, j) == NULL)

			continue;
@@ -192,6 +204,17 @@ cleanup:
	if (stdin_pipe[1] != -1)

		close(stdin_pipe[1]);
+ 
#ifdef PROC_REAP_KILL
+ 
	procctl(P_PID, getpid(), PROC_REAP_STATUS, &info);
+ 
	if (info.rs_children != 0) {
+ 
		killemall.rk_sig = SIGKILL;
+ 
		killemall.rk_flags = 0;
+ 
		if (procctl(P_PID, getpid(), PROC_REAP_KILL, &killemall) != 0)
+ 
			warnx("Fail to kill children");
+ 
	}
+ 
	procctl(P_PID, getpid(), PROC_REAP_RELEASE, NULL);
+ 
#endif
+ 


	return (ret);

}