diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2020-06-03 15:47:11 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2020-06-04 12:54:47 +0300 |
| commit | 1af067a15b3000c559c93d6a8dd5a5079c4f8af0 (patch) | |
| tree | 603d180bdb131e922023c15913798cad896c997a /lib | |
| parent | a9b6c4c74bfddf7d3d2da3be08804fe315945cea (diff) | |
lib/igt_core: Don't kill the world after a failed fork
If we fail to fork (e.g. due to restrictive limits) -1 gets written as
PID of our child and we assert out.
The cleanup that happens afterwards tries to kill all our children,
which ends up in kill(-1, SIGKILL) which is not good.
This patch makes sure of two things:
* -1 doesn't get written down as our child
* when we are killing children we make sure that pid > 0
Reported-by: Fei Yang <fei.yang@intel.com>
Cc: Michael Hebenstreit <michael.hebenstreit@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Tested-by: Michael Hebenstreit <michael.hebenstreit@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_core.c | 19 | ||||
| -rw-r--r-- | lib/tests/igt_fork.c | 6 |
2 files changed, 15 insertions, 10 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index f8ccc8d2a..cbcc3f4df 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1399,8 +1399,10 @@ static void exit_subtest(const char *result) /* If the subtest aborted, it may have left children behind */ for (int c = 0; c < num_test_children; c++) { - kill(test_children[c], SIGKILL); - waitpid(test_children[c], NULL, 0); /* don't leave zombies! */ + if (test_children[c] > 0) { + kill(test_children[c], SIGKILL); + waitpid(test_children[c], NULL, 0); /* don't leave zombies! */ + } } num_test_children = 0; @@ -1986,8 +1988,10 @@ void __igt_fail_assert(const char *domain, const char *file, const int line, static void kill_children(void) { - for (int c = 0; c < num_test_children; c++) - kill(test_children[c], SIGKILL); + for (int c = 0; c < num_test_children; c++) { + if (test_children[c] > 0) + kill(test_children[c], SIGKILL); + } } void __igt_abort(const char *domain, const char *file, const int line, @@ -2276,6 +2280,7 @@ bool __igt_fork(void) switch (test_children[num_test_children++] = fork()) { case -1: + num_test_children--; /* so we won't kill(-1) during cleanup */ igt_assert(0); case 0: test_child = true; @@ -2335,8 +2340,7 @@ int __igt_waitchildren(void) err = 256; } - for (c = 0; c < num_test_children; c++) - kill(test_children[c], SIGKILL); + kill_children(); } count++; @@ -2370,8 +2374,7 @@ static void igt_alarm_killchildren(int signal) { igt_info("Timed out waiting for children\n"); - for (int c = 0; c < num_test_children; c++) - kill(test_children[c], SIGKILL); + kill_children(); } /** diff --git a/lib/tests/igt_fork.c b/lib/tests/igt_fork.c index 4fd0e0c86..84492b2d1 100644 --- a/lib/tests/igt_fork.c +++ b/lib/tests/igt_fork.c @@ -123,8 +123,10 @@ static void subtest_leak(void) } /* We expect the exit_subtest to cleanup after the igt_fork */ - for (int i = 0; i < num_children; i++) - assert(kill(children[i], 0) == -1 && errno == ESRCH); + for (int i = 0; i < num_children; i++) { + if (children[i] > 0) + assert(kill(children[i], 0) == -1 && errno == ESRCH); + } munmap(children, 4096); |