diff options
| author | Sverker Eriksson <[email protected]> | 2018-05-18 17:59:03 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-05-18 17:59:03 +0200 |
| commit | 9338ea3f9d3f7db949001a461456e8ce0339a1b5 (patch) | |
| tree | 242c5b90e1019eafbc161aefa828f7639a13b459 /erts/emulator/beam | |
| parent | e3bc55fb1e768cd30140a769507b50bddf3cb6ca (diff) | |
| download | otp-9338ea3f9d3f7db949001a461456e8ce0339a1b5.tar.gz otp-9338ea3f9d3f7db949001a461456e8ce0339a1b5.tar.bz2 otp-9338ea3f9d3f7db949001a461456e8ce0339a1b5.zip | |
erts: Fix narrow race between ets:new and ets:delete
of same named table.
If other process does ets:delete
before ets:new has completely finished and done save_owned_table
then ets:delete might do delete_owned_table and deref wild pointers
in tb->common.owned.
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 3a29f8cf56..c1eaaeee06 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -1776,9 +1776,11 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2) ret = make_tid(BIF_P, tb); save_sched_table(BIF_P, tb); + save_owned_table(BIF_P, tb); if (is_named && !insert_named_tab(BIF_ARG_1, tb, 0)) { tid_clear(BIF_P, tb); + delete_owned_table(BIF_P, tb); db_lock(tb,LCK_WRITE); free_heir_data(tb); @@ -1789,7 +1791,6 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2) } BIF_P->flags |= F_USING_DB; /* So we can remove tb if p dies */ - save_owned_table(BIF_P, tb); #ifdef HARDDEBUG erts_fprintf(stderr, |