diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-12 02:20:06 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-12 02:20:06 +0000 |
commit | 027748a314899b45e7a57993a16ab8284ecefc10 (patch) | |
tree | 32a5cf8a8d98972952e4486dd5fc5891a0f20507 | |
parent | 23abce4bff51a4abf6d54599df9038831c682f42 (diff) |
merge revision(s) 43373: [Backport #9036]
* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
points to. This leaves no possible window where fptr->fd is invalid
to userspace (even for any threads running w/o GVL). based on the
patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
[Bug #9036]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | io.c | 12 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,12 @@ +Fri Sep 12 11:15:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and + call rb_cloexec_dup2 on it to atomically replace the file fptr->fd + points to. This leaves no possible window where fptr->fd is invalid + to userspace (even for any threads running w/o GVL). based on the + patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943]. + [Bug #9036] + Wed Sep 10 12:34:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (io_close): ignore only "closed stream" IOError and @@ -6628,10 +6628,14 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file) } } else { - if (close(fptr->fd) < 0) - rb_sys_fail_path(fptr->pathv); - fptr->fd = -1; - fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666); + int tmpfd = rb_sysopen(fptr->pathv, oflags, 0666); + int err = 0; + if (rb_cloexec_dup2(tmpfd, fptr->fd) < 0) + err = errno; + (void)close(tmpfd); + if (err) { + rb_sys_fail_path(fptr->pathv); + } } return file; @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 566 +#define RUBY_RELEASE_DATE "2014-09-12" +#define RUBY_PATCHLEVEL 567 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |