|
 |
e0f8ad |
From d79fe162c009788888faaf0317253b6f0cac7092 Mon Sep 17 00:00:00 2001
|
|
|
e0f8ad |
From: Kevin Buettner <kevinb@redhat.com>
|
|
|
e0f8ad |
Date: Thu, 23 Apr 2020 17:05:34 -0400
|
|
|
e0f8ad |
Subject: [SV 58232] Disable inheritance of jobserver FDs for recursive make
|
|
|
e0f8ad |
|
|
|
e0f8ad |
A parent make will invoke a sub-make with close-on-exec disabled for
|
|
|
e0f8ad |
the jobserver pipe FDs. Force close-on-exec to be to be enabled in
|
|
|
e0f8ad |
the sub-make so the pipe is not always passed to child jobs.
|
|
|
e0f8ad |
|
|
|
e0f8ad |
I have a test case which, when invoked with a suitable -j switch,
|
|
|
e0f8ad |
will hang if the recipe inherits the jobserver pipe. This test case
|
|
|
e0f8ad |
was inspired by a real world case in which testing GDB on Fedora
|
|
|
e0f8ad |
would hang due to some poorly written test GDB cases having been
|
|
|
e0f8ad |
passed the jobserver file descriptors.
|
|
|
e0f8ad |
|
|
|
e0f8ad |
* src/posixos.c (jobserver_parse_auth): Call fd_noinherit() for
|
|
|
e0f8ad |
jobserver pipe descriptors.
|
|
|
e0f8ad |
|
|
|
e0f8ad |
Copyright-paperwork-exempt: yes
|
|
|
e0f8ad |
|
|
|
e0f8ad |
diff --git a/src/posixos.c b/src/posixos.c
|
|
|
e0f8ad |
index 525f292c..eab175a4 100644
|
|
|
e0f8ad |
--- a/src/posixos.c
|
|
|
e0f8ad |
+++ b/src/posixos.c
|
|
|
e0f8ad |
@@ -145,6 +145,11 @@ jobserver_parse_auth (const char *auth)
|
|
|
e0f8ad |
/* When using pselect() we want the read to be non-blocking. */
|
|
|
e0f8ad |
set_blocking (job_fds[0], 0);
|
|
|
e0f8ad |
|
|
|
e0f8ad |
+ /* By default we don't send the job pipe FDs to our children.
|
|
|
e0f8ad |
+ See jobserver_pre_child() and jobserver_post_child(). */
|
|
|
e0f8ad |
+ fd_noinherit (job_fds[0]);
|
|
|
e0f8ad |
+ fd_noinherit (job_fds[1]);
|
|
|
e0f8ad |
+
|
|
|
e0f8ad |
return 1;
|
|
|
e0f8ad |
}
|
|
|
e0f8ad |
|