2 files changed, 13 insertions, 2 deletions

diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index 0738e3db1..a6bc62321 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -20,7 +20,16 @@ int FAST_FUNC open_transformer(int src_fd,
 
         xpiped_pair(fd_pipe);
 
-        pid = BB_MMU ? xfork() : xvfork();
+#if BB_MMU
+        pid = fork();
+        if (pid == -1)
+                bb_perror_msg_and_die("can't fork");
+#else
+        pid = vfork();
+        if (pid == -1)
+                bb_perror_msg_and_die("can't vfork");
+#endif
+
         if (pid == 0) {
                 /* child process */
                 close(fd_pipe.rd); /* We don't want to read from the parent */
diff --git a/archival/tar.c b/archival/tar.c
index 17ac6c55a..526edb69d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -536,7 +536,9 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
         (void) &zip_exec;
 #endif
 
-        gzipPid = xvfork();
+        gzipPid = vfork();
+        if (gzipPid < 0)
+                bb_perror_msg_and_die("can't vfork");
 
         if (gzipPid == 0) {
                 /* child */