From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH v3 2/2] fiber: fiber_join -- don't crash on misuse Date: Thu, 29 Apr 2021 14:10:31 +0300 [thread overview] Message-ID: <YIqUJ3a+V0Lwr3Hz@grain> (raw) In-Reply-To: <YInd6rCbd1j50rPB@grain> In case if we call fiber_join() over the non joinable fiber we trigger an assert and crash execution (on debug build). On release build the asserts will be zapped and won't cause problems but there is an another one -- the target fiber will cause double fiber_reset() calls which in result cause to unregister_fid() with id = 0 (not causing crash but definitely out of intention) and we will drop stack protection which might be not ours anymore. Since we're not allowed to break API on C level lets just panic early in case of such misuse, it is a way better than continue operating with potentially screwed data in memory. Fixes #6046 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- issue https://github.com/tarantool/tarantool/issues/6046 branch gorcunov/gh-6046-fiber-join-3 changelogs/unreleased/gh-6046-fiber-join-misuse.md | 6 ++++++ src/lib/core/fiber.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/gh-6046-fiber-join-misuse.md diff --git a/changelogs/unreleased/gh-6046-fiber-join-misuse.md b/changelogs/unreleased/gh-6046-fiber-join-misuse.md new file mode 100644 index 000000000..32c15566d --- /dev/null +++ b/changelogs/unreleased/gh-6046-fiber-join-misuse.md @@ -0,0 +1,6 @@ +## bugfix/core + +* Fixed lack of testing for non noinable fibers in `fiber_join()` call. + This could lead to unpredictable results. Note the issue affects C + level only, in Lua interface `fiber::join()`` the protection is + turned on already. diff --git a/src/lib/core/fiber.c b/src/lib/core/fiber.c index a4b60e864..196dffe26 100644 --- a/src/lib/core/fiber.c +++ b/src/lib/core/fiber.c @@ -620,7 +620,8 @@ fiber_join(struct fiber *fiber) int fiber_join_timeout(struct fiber *fiber, double timeout) { - assert(fiber->flags & FIBER_IS_JOINABLE); + if ((fiber->flags & FIBER_IS_JOINABLE) == 0) + panic("the fiber is not joinable"); if (! fiber_is_dead(fiber)) { bool exceeded = false; -- 2.30.2
next prev parent reply other threads:[~2021-04-29 11:10 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-28 10:22 [Tarantool-patches] [PATCH v2 0/2] fiber: prevent fiber_join from misuse Cyrill Gorcunov via Tarantool-patches 2021-04-28 10:22 ` [Tarantool-patches] [PATCH v2 1/2] fiber: fiber_join -- drop redundat variable Cyrill Gorcunov via Tarantool-patches 2021-04-28 15:13 ` Serge Petrenko via Tarantool-patches 2021-04-28 10:22 ` [Tarantool-patches] [PATCH v2 2/2] fiber: fiber_join -- don't crash on misuse Cyrill Gorcunov via Tarantool-patches 2021-04-28 15:13 ` Serge Petrenko via Tarantool-patches 2021-04-28 15:21 ` Cyrill Gorcunov via Tarantool-patches 2021-04-28 15:34 ` Serge Petrenko via Tarantool-patches 2021-04-28 21:16 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-28 22:12 ` Cyrill Gorcunov via Tarantool-patches 2021-04-29 11:10 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-04-29 19:37 ` [Tarantool-patches] [PATCH v3 " Vladislav Shpilevoy via Tarantool-patches 2021-04-29 20:39 ` Cyrill Gorcunov via Tarantool-patches 2021-04-29 21:10 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-30 8:13 ` [Tarantool-patches] [PATCH v2 0/2] fiber: prevent fiber_join from misuse Kirill Yukhin via Tarantool-patches
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=YIqUJ3a+V0Lwr3Hz@grain \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 2/2] fiber: fiber_join -- don'\''t crash on misuse' \ /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