archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 59975: [Backport #13916]

Browse source 
process: block/unblock signals around fork

	As with forking for execve(2) in `spawn', we must block signals
	to ensure they are handled correctly in a freshly `fork'-ed child.

	* process.c (retry_fork_ruby): block/unblock signals around fork
	  (rb_fork_ruby): re-enable signals in forked child
	* test/ruby/test_process.rb (test_forked_child_signal): new test
	  [ruby-core:82883] [Bug #13916]

	  Thanks to Russell Davis for the bug report and test case.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-03-18 14:56:08 +00:00
parent 2fd7044e9a
commit cfb61e5962
4 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Sun Mar 18 23:55:23 2018 Eric Wong <normalperson@yhbt.net>
process: block/unblock signals around fork
As with forking for execve(2) in spawn', we must block signals
to ensure they are handled correctly in a freshlyfork'-ed child.
* process.c (retry_fork_ruby): block/unblock signals around fork
(rb_fork_ruby): re-enable signals in forked child
* test/ruby/test_process.rb (test_forked_child_signal): new test
[Bug #13916]
Thanks to Russell Davis for the bug report and test case.
Sun Mar 18 23:52:37 2018 Kazuki Tsujimoto <kazuki@callcc.net>
vm.c: fix `cfp consistency error' which occurs when raising exception

8
process.c
View file

@ -3648,7 +3648,7 @@ rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), voi
}
static rb_pid_t
retry_fork_ruby(int *status)
retry_fork_ruby(int *status, struct child_handler_disabler_state *old)
{
rb_pid_t pid;
int try_gc = 1;
@ -3656,10 +3656,12 @@ retry_fork_ruby(int *status)
while (1) {
prefork();
before_fork_ruby();
disable_child_handler_before_fork(old);
pid = fork();
if (pid == 0) /* fork succeed, child process */
return pid;
preserving_errno(after_fork_ruby());
preserving_errno(disable_child_handler_fork_parent(old));
if (0 < pid) /* fork succeed, parent process */
return pid;
/* fork failed */
@ -3672,14 +3674,16 @@ rb_pid_t
rb_fork_ruby(int *status)
{
rb_pid_t pid;
struct child_handler_disabler_state old;
if (status) *status = 0;
pid = retry_fork_ruby(status);
pid = retry_fork_ruby(status, &old);
if (pid < 0)
return pid;
if (!pid) {
after_fork_ruby();
disable_child_handler_fork_parent(&old); /* yes, bad name */
}
return pid;
}

10
test/ruby/test_process.rb
View file

@ -2298,4 +2298,14 @@ EOS
end
end
end
def test_forked_child_handles_signal
skip "fork not supported" unless Process.respond_to?(:fork)
assert_normal_exit(<<-"end;", '[ruby-core:82883] [Bug #13916]')
require 'timeout'
pid = fork { sleep }
Process.kill(:TERM, pid)
assert_equal pid, Timeout.timeout(30) { Process.wait(pid) }
end;
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-18"
#define RUBY_PATCHLEVEL 417
#define RUBY_PATCHLEVEL 418
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3