summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-04-20 03:22:26 (GMT)
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-04-20 03:22:26 (GMT)
commitb456eab2ea77eda51c8d5c06c24d195a6a2932e1 (patch)
treeea26959ba616d3327ff501f4f4cc79f9c17d838d /variable.c
parent5b9bb500884a0e296f2fcd707bf61e08c6026cd2 (diff)
variable.c: fix thread + fork errors in autoload
This is fairly non-intrusive bugfix to prevent children from trying to reach into thread stacks of the parent. I will probably reuse this idea and redo r62934, too (same bug). * vm_core.h (typedef struct rb_vm_struct): add fork_gen counter * thread.c (rb_thread_atfork_internal): increment fork_gen * variable.c (struct autoload_data_i): store fork_gen * variable.c (check_autoload_data): remove (replaced with get_...) * variable.c (get_autoload_data): check fork_gen when retrieving * variable.c (check_autoload_required): use get_autoload_data * variable.c (rb_autoloading_value): ditto * variable.c (rb_autoload_p): ditto * variable.c (current_autoload_data): ditto * variable.c (autoload_reset): reset fork_gen, adjust indent * variable.c (rb_autoload_load): set fork_gen when setting state * test/ruby/test_autoload.rb (test_autoload_fork): new test [ruby-core:86410] [Bug #14634] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c32
1 files changed, 23 insertions, 9 deletions
diff --git a/variable.c b/variable.c
index 46911bf..6de7b47 100644
--- a/variable.c
+++ b/variable.c
@@ -21,6 +21,7 @@
#include "ccan/list/list.h"
#include "id_table.h"
#include "debug_counter.h"
+#include "vm_core.h"
static struct rb_id_table *rb_global_tbl;
static ID autoload, classpath, tmp_classpath, classid;
@@ -1857,6 +1858,7 @@ struct autoload_data_i {
rb_const_flag_t flag;
VALUE value;
struct autoload_state *state; /* points to on-stack struct */
+ rb_serial_t fork_gen;
};
static void
@@ -1879,8 +1881,18 @@ static const rb_data_type_t autoload_data_i_type = {
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
-#define check_autoload_data(av) \
- (struct autoload_data_i *)rb_check_typeddata((av), &autoload_data_i_type)
+static struct autoload_data_i *
+get_autoload_data(VALUE av)
+{
+ struct autoload_data_i *ele = rb_check_typeddata(av, &autoload_data_i_type);
+
+ /* do not reach across stack for ->state after forking: */
+ if (ele && ele->state && ele->fork_gen != GET_VM()->fork_gen) {
+ ele->state = 0;
+ ele->fork_gen = 0;
+ }
+ return ele;
+}
RUBY_FUNC_EXPORTED void
rb_autoload(VALUE mod, ID id, const char *file)
@@ -1980,7 +1992,7 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath)
const char *loading;
int safe;
- if (!(load = autoload_data(mod, id)) || !(ele = check_autoload_data(load))) {
+ if (!(load = autoload_data(mod, id)) || !(ele = get_autoload_data(load))) {
return 0;
}
file = ele->feature;
@@ -2018,7 +2030,7 @@ rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag)
VALUE load;
struct autoload_data_i *ele;
- if (!(load = autoload_data(mod, id)) || !(ele = check_autoload_data(load))) {
+ if (!(load = autoload_data(mod, id)) || !(ele = get_autoload_data(load))) {
return 0;
}
if (ele->state && ele->state->thread == rb_thread_current()) {
@@ -2085,8 +2097,9 @@ autoload_reset(VALUE arg)
int need_wakeups = 0;
if (state->ele->state == state) {
- need_wakeups = 1;
- state->ele->state = 0;
+ need_wakeups = 1;
+ state->ele->state = 0;
+ state->ele->fork_gen = 0;
}
/* At the last, move a value defined in autoload to constant table */
@@ -2168,7 +2181,7 @@ rb_autoload_load(VALUE mod, ID id)
if (src && loading && strcmp(src, loading) == 0) return Qfalse;
/* set ele->state for a marker of autoloading thread */
- if (!(ele = check_autoload_data(load))) {
+ if (!(ele = get_autoload_data(load))) {
return Qfalse;
}
@@ -2178,6 +2191,7 @@ rb_autoload_load(VALUE mod, ID id)
state.thread = rb_thread_current();
if (!ele->state) {
ele->state = &state;
+ ele->fork_gen = GET_VM()->fork_gen;
/*
* autoload_reset will wake up any threads added to this
@@ -2215,7 +2229,7 @@ rb_autoload_p(VALUE mod, ID id)
}
load = check_autoload_required(mod, id, 0);
if (!load) return Qnil;
- return (ele = check_autoload_data(load)) ? ele->feature : Qnil;
+ return (ele = get_autoload_data(load)) ? ele->feature : Qnil;
}
MJIT_FUNC_EXPORTED void
@@ -2638,7 +2652,7 @@ current_autoload_data(VALUE mod, ID id)
struct autoload_data_i *ele;
VALUE load = autoload_data(mod, id);
if (!load) return 0;
- ele = check_autoload_data(load);
+ ele = get_autoload_data(load);
if (!ele) return 0;
/* for autoloading thread, keep the defined value to autoloading storage */
if (ele->state && (ele->state->thread == rb_thread_current())) {