From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 2/3] merger: fix NULL dereference when called via iproto Date: Fri, 19 Jun 2020 00:47:46 +0200 [thread overview] Message-ID: <b2abbbee-207d-08e8-8ba1-3e26f1d4789a@tarantool.org> (raw) In-Reply-To: <20200617175339.aieq23vkcdqu4z7u@tkn_work_nb> Hi! Thanks for the fixes! On 17/06/2020 19:53, Alexander Turenko wrote: >>> Usage of the fiber-local Lua state is not quite correct now: merge >>> source code may left garbage on a stack in case of failures (like >> >> 1. merge -> merger. > > I use term 'merge source' for sources, we agreed on it with Vladimir D., > when the merger was designed. Removed 'code' to don't confuse a reader: > 'merge source code' -> 'a merge source'. Exactly. I read it as 'source code', not 'merge source'. Now it is fine. >>> + struct lua_State *L = luaT_newthread(tarantool_L); >>> + if (L == NULL) >>> + return NULL; >> >> 2. luaT_newthread() does not set a diag. That may lead to a crash, >> because as far as I see, this function may be called >> lbox_merge_source_gen() indirectly, somewhere deep in the callstack. >> And it luaT_error(), when merge_source_next() fails. > > As I see, it is not so. > > luaT_newthread_wrapper() may raise a Lua error (only 'not enough memory' > I guess), luaT_cpcall() calls luaT_toerror() in this case, which invokes > diag_set(LuajitError, <...>). > > Isn't I miss something? You are right, all is fine here.
next prev parent reply other threads:[~2020-06-18 22:47 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-01 18:10 [Tarantool-patches] [PATCH 0/3] Merger's NULL defererence Alexander Turenko 2020-06-01 18:10 ` [Tarantool-patches] [PATCH 1/3] merger: drop luaL prefix where contract allows it Alexander Turenko 2020-06-02 22:47 ` Vladislav Shpilevoy 2020-06-07 16:57 ` Alexander Turenko 2020-06-11 16:17 ` Vladislav Shpilevoy 2020-06-16 11:59 ` Igor Munkin 2020-06-17 17:53 ` Alexander Turenko 2020-06-01 18:10 ` [Tarantool-patches] [PATCH 2/3] merger: fix NULL dereference when called via iproto Alexander Turenko 2020-06-02 22:48 ` Vladislav Shpilevoy 2020-06-07 16:58 ` Alexander Turenko 2020-06-11 16:18 ` Vladislav Shpilevoy 2020-06-17 17:53 ` Alexander Turenko 2020-06-18 22:47 ` Vladislav Shpilevoy [this message] 2020-06-01 18:10 ` [Tarantool-patches] [PATCH 3/3] lua: expose temporary Lua state for iproto calls Alexander Turenko 2020-06-02 22:48 ` Vladislav Shpilevoy 2020-06-07 16:58 ` Alexander Turenko 2020-06-02 22:47 ` [Tarantool-patches] [PATCH 0/3] Merger's NULL defererence Vladislav Shpilevoy 2020-06-07 17:17 ` Alexander Turenko 2020-06-07 16:58 ` [Tarantool-patches] [PATCH 2.5/3] merger: clean fiber-local Lua stack after next() Alexander Turenko 2020-06-11 16:20 ` Vladislav Shpilevoy 2020-06-17 17:53 ` Alexander Turenko 2020-06-18 22:48 ` Vladislav Shpilevoy 2020-06-19 7:41 ` Alexander Turenko 2020-06-17 17:54 ` [Tarantool-patches] [PATCH 0/3] Merger's NULL defererence Alexander Turenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b2abbbee-207d-08e8-8ba1-3e26f1d4789a@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/3] merger: fix NULL dereference when called via iproto' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox