From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id F035C6F805C; Wed, 22 Nov 2023 17:37:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F035C6F805C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700663833; bh=ttM4maaIJ1VXWYeQBe7cDiSokU/25TsDGLgpRDmQ4YE=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ktUcUDjzmTzkXBPPZxBwzGerRHLE7xoqq29pLfSLw0OfJC68AFkIJwEcWy/ANW2AI EXWhHhXI6+cElec69aLnjLgyGVDg4F/A4jY8ldLjuUGg0a+uTfswiAnk0Gjx/gLKWJ q5l0rjy9drfhoWkFqmlur3ZFWU8K0qcwHAeWhdxU= Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D895B6F805C for ; Wed, 22 Nov 2023 17:35:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D895B6F805C Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50abbb23122so815983e87.3 for ; Wed, 22 Nov 2023 06:35:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700663750; x=1701268550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TmT+MDcMJ2lauIPRiiGdBpOT2+Ic1edarLKzc7fE21g=; b=HiuGRtMjlzAbXhXsuh9Ind9Ja8NvgFG+Zy8NtvcSsJG+uxY1PU3By0jyE5/IcumEeP yQ8WrwH00cHcC7dWHhZplwycNPYGRCOhvbiptzFbYzh9S93RHjPz8y6l1DFei0mvt80c hBukQV55iAkLzG6Yb569NNj4K/OZW/h7MVpmEkhjkjXjLPOTG2Z5hiZM5j4MuMdC718e GJLN99yt2xKOz/zME18ShOgdXhajdSxYBixbSp6fXPehIwcORJuasXJCoJZkZ1LDyhl3 /VcIHNdIIVZTvvQ4ERQJ4/V7X3QBXNjULh2Y3SDFVv3scmjl1tW5eCaMF7P8FmnKjI0t /+ng== X-Gm-Message-State: AOJu0YyQdqhrV+xx6RMO+vF2VG/72mBKhz6suKuAJBK/ijDpi/FtNS0o OsDKb+YLPZMVb6nbA4wL0ZjgW5DH0bWAfu1Y X-Google-Smtp-Source: AGHT+IHAjd5VWl3ZN2rRxGCqLiGhdSnwaGPCcGm5ciTBSvJoF0K2vV22TogOeCvf4OufVlJzXqaxAA== X-Received: by 2002:a05:6512:3135:b0:503:343a:829f with SMTP id p21-20020a056512313500b00503343a829fmr1714932lfd.23.1700663749988; Wed, 22 Nov 2023 06:35:49 -0800 (PST) Received: from localhost.localdomain ([185.205.79.42]) by smtp.gmail.com with ESMTPSA id x15-20020a19e00f000000b005079a3c872esm1894570lfg.240.2023.11.22.06.35.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Nov 2023 06:35:49 -0800 (PST) To: tarantool-patches@dev.tarantool.org, sergeyb@tarantool.org, skaplun@tarantool.org, m.kokryashkin@tarantool.org Date: Wed, 22 Nov 2023 17:35:34 +0300 Message-Id: <20231122143534.11330-4-max.kokryashkin@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231122143534.11330-1-max.kokryashkin@gmail.com> References: <20231122143534.11330-1-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 3/3] Follow-up fix for stack overflow handling cleanup. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maksim Kokryashkin via Tarantool-patches Reply-To: Maksim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall (cherry-picked from commit aa6b15c1a8922848bd6f596ba384824ca3fe0f5f) The stack overflow error is thrown in `lj_state_growstack` only if the coroutine status is `OK`, however, stack overflow can happen on a yielded coroutine too. This patch fixes the condition for status, so now the error thrown on yielded coroutines too. Maxim Kokryashkin: * added the description and the test for the patch Part of tarantool/tarantool#9145 --- src/lj_state.c | 2 +- .../lj-962-premature-stack-overflow.test.c | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/lj_state.c b/src/lj_state.c index d8a5134c..01d4901a 100644 --- a/src/lj_state.c +++ b/src/lj_state.c @@ -126,7 +126,7 @@ void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need) if (L->stacksize > LJ_STACK_MAXEX) lj_err_throw(L, LUA_ERRERR); /* Does not invoke an error handler. */ /* 1. We are _at_ the limit after the last growth. */ - if (!L->status) { /* 2. Throw 'stack overflow'. */ + if (L->status < LUA_ERRRUN) { /* 2. Throw 'stack overflow'. */ L->status = LUA_ERRRUN; /* Prevent ending here again for pushed msg. */ lj_err_msg(L, LJ_ERR_STKOV); /* May invoke an error handler. */ } diff --git a/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c b/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c index 12cb9004..461e0ccc 100644 --- a/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c +++ b/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c @@ -24,6 +24,20 @@ static int fill_stack(lua_State *L) return 0; } +static int immediate_yield(lua_State *L) +{ + return lua_yield(L, 0); +} + +static int overflow_suspended_coro(lua_State *L) +{ + lua_State *newL = lua_newthread(L); + lua_pushcfunction(newL, immediate_yield); + lua_resume(newL, 0); + fill_stack(newL); + return 0; +} + static int premature_stackoverflow(void *test_state) { lua_State *L = test_state; @@ -50,12 +64,21 @@ static int stackoverflow_during_stackoverflow(void *test_state) return TEST_EXIT_SUCCESS; } +static int stackoverflow_on_suspended_coro(void *test_state) +{ + lua_State *L = test_state; + int status = lua_cpcall(L, overflow_suspended_coro, NULL); + assert_true(status == LUA_ERRRUN); + return TEST_EXIT_SUCCESS; +} + int main(void) { lua_State *L = utils_lua_init(); const struct test_unit tgroup[] = { test_unit_def(premature_stackoverflow), test_unit_def(stackoverflow_during_stackoverflow), + test_unit_def(stackoverflow_on_suspended_coro), }; const int test_result = test_run_group(tgroup, L); utils_lua_close(L); -- 2.39.3 (Apple Git-145)