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 80A8C6EFDE8; Sat, 18 Nov 2023 02:42:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 80A8C6EFDE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700264574; bh=Byq+GHrLl+YjAZA/QmeImgBlac7wPKAfWjmRg/cfzBE=; 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=yiAOVWl2TCBuoVm6rzzEeattNcue/kUxX5gr3O7K5BF3BZ1v9ahwr7sk8qVsy0lh9 /H/MOa8D+QdSFjtNrmGz9k+0TzvNV7szPxs1XB6H8S6hV5W5wjsY22h9rpCSBunLYp IjGFaqFGvBzDXFY3/ubJkK+t3S7odcHKt6S5IinI= Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 2F2BE6EFDE8 for ; Sat, 18 Nov 2023 02:41:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2F2BE6EFDE8 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2c5056059e0so35589251fa.3 for ; Fri, 17 Nov 2023 15:41:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700264490; x=1700869290; 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=9/8fkMpYlatMoi4cDXoRG2zsyjwSqHzsO9kdJbEN/s8=; b=MbmM1PTTodgEYhy4plGhrQ6K5pMjqVwlIibaY0a36Kyxks+N6WKsPHeRXHjjN4ovyC v7oV176JrK7CIzGp8Gv71HFDfjpAGvqfzmidkfx9al88n/2ysG6uj278ZwXXUnU6rmhh 753upJouiH+bYvgSVGx2JYI3PuLyb4RnSc238ju5R6OYQNblx1NGYiGWd37TDxweAOBV b8GQeCPoNBZex+tYirEpuYv92J+8ive3h/fsFUIRlua1dHyZxj39zOLyPAz2axFbWbaT duaaOL7C2k5wQ09qa9QVc+ffZJEAO++gaTvDC45zowzrUXrF10mQlcCz9MTnpt5pPD9X 3sEQ== X-Gm-Message-State: AOJu0YzJ5Hpfs8XSSTc+60Zc2Gs1mo/LKlHivR73KZ01z4MHT7Q0KN+D FPlIegDCiH1tbBIw1Xij3jbV5qPtQJqB7vLl X-Google-Smtp-Source: AGHT+IFz/lf+drSMwWMfD8Uyxj94AvLxX2wJQC3sWN4BEEItXleHavZwofWHbtf7icE3lQhw8msz5g== X-Received: by 2002:a2e:90c4:0:b0:2c7:b9b3:4ec1 with SMTP id o4-20020a2e90c4000000b002c7b9b34ec1mr724396ljg.17.1700264490178; Fri, 17 Nov 2023 15:41:30 -0800 (PST) Received: from localhost.localdomain (95-24-0-215.broadband.corbina.ru. [95.24.0.215]) by smtp.gmail.com with ESMTPSA id w14-20020a2e9bce000000b002c83b0bd971sm360587ljj.2.2023.11.17.15.41.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Nov 2023 15:41:29 -0800 (PST) To: tarantool-patches@dev.tarantool.org, sergeyb@tarantool.org, skaplun@tarantool.org, m.kokryashkin@tarantool.org Date: Sat, 18 Nov 2023 02:41:16 +0300 Message-Id: <20231117234116.60037-4-max.kokryashkin@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231117234116.60037-1-max.kokryashkin@gmail.com> References: <20231117234116.60037-1-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit 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 0873636a..7a03038b 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 @@ -21,6 +21,20 @@ static int fill_stack(lua_State *L) return 1; } +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 1; +} + static int premature_stackoverflow(void *test_state) { lua_State *L = test_state; @@ -29,11 +43,20 @@ static int premature_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_on_suspended_coro), }; const int test_result = test_run_group(tgroup, L); utils_lua_close(L); -- 2.39.3 (Apple Git-145)