about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-10-28 21:17:45 -0400
committerRich Felker <dalias@aerifal.cx>2012-10-28 21:17:45 -0400
commit76f28cfce59dfc499252c874f87c34567e6c86c6 (patch)
tree4a1c68348d9062d610fb27f23135fb3028b339e8
parentdd762cf6e5886ed297886a19a2e2ffd49157a786 (diff)
downloadmusl-76f28cfce59dfc499252c874f87c34567e6c86c6.tar.gz
musl-76f28cfce59dfc499252c874f87c34567e6c86c6.tar.xz
musl-76f28cfce59dfc499252c874f87c34567e6c86c6.zip
system is a cancellation point
ideally, system would also be cancellable while running the external
command, but I cannot find any way to make that work without either
leaking zombie processes or introducing behavior that is far outside
what the standard specifies. glibc handles cancellation by killing the
child process with SIGKILL, but this could be unsafe in that it could
leave the data being manipulated by the command in an inconsistent
state.
-rw-r--r--src/process/system.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/process/system.c b/src/process/system.c
index ebe207f5..0cc8b810 100644
--- a/src/process/system.c
+++ b/src/process/system.c
@@ -13,6 +13,7 @@ weak_alias(dummy_0, __acquire_ptc);
 weak_alias(dummy_0, __release_ptc);
 
 pid_t __vfork(void);
+void __testcancel(void);
 
 int system(const char *cmd)
 {
@@ -21,6 +22,8 @@ int system(const char *cmd)
 	struct sigaction sa = { .sa_handler = SIG_IGN }, oldint, oldquit;
 	int status = -1, i;
 
+	__testcancel();
+
 	if (!cmd) return 1;
 
 	sigaction(SIGINT, &sa, &oldint);