From ab51d5ecfd142940d173745db1c610b525f36a3b Mon Sep 17 00:00:00 2001 From: wangziliang Date: Thu, 9 Oct 2025 17:59:07 +0800 Subject: [PATCH] fix CVE-2025-49844 --- fix-CVE-2025-49844.patch | 32 ++++++++++++++++++++++++++++++++ redis5.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 fix-CVE-2025-49844.patch diff --git a/fix-CVE-2025-49844.patch b/fix-CVE-2025-49844.patch new file mode 100644 index 0000000..17074b9 --- /dev/null +++ b/fix-CVE-2025-49844.patch @@ -0,0 +1,32 @@ +From d5728cb5795c966c5b5b1e0f0ac576a7e69af539 Mon Sep 17 00:00:00 2001 +From: Mincho Paskalev +Date: Mon, 23 Jun 2025 11:41:37 +0300 +Subject: [PATCH] Lua script may lead to remote code execution (CVE-2025-49844) + +--- + deps/lua/src/lparser.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/deps/lua/src/lparser.c b/deps/lua/src/lparser.c +index dda7488dcad..ee7d90c90d7 100644 +--- a/deps/lua/src/lparser.c ++++ b/deps/lua/src/lparser.c +@@ -384,13 +384,17 @@ Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, const char *name) { + struct LexState lexstate; + struct FuncState funcstate; + lexstate.buff = buff; +- luaX_setinput(L, &lexstate, z, luaS_new(L, name)); ++ TString *tname = luaS_new(L, name); ++ setsvalue2s(L, L->top, tname); ++ incr_top(L); ++ luaX_setinput(L, &lexstate, z, tname); + open_func(&lexstate, &funcstate); + funcstate.f->is_vararg = VARARG_ISVARARG; /* main func. is always vararg */ + luaX_next(&lexstate); /* read first token */ + chunk(&lexstate); + check(&lexstate, TK_EOS); + close_func(&lexstate); ++ --L->top; + lua_assert(funcstate.prev == NULL); + lua_assert(funcstate.f->nups == 0); + lua_assert(lexstate.fs == NULL); diff --git a/redis5.spec b/redis5.spec index ef70e8a..1627663 100644 --- a/redis5.spec +++ b/redis5.spec @@ -6,7 +6,7 @@ %global Pname redis Name: redis5 Version: 5.0.14 -Release: 5 +Release: 6 Summary: A persistent key-value database License: BSD and MIT URL: https://redis.io @@ -28,6 +28,7 @@ Patch0002: Fix-display-error-message.patch Patch0003: Add-loongarch64-support.patch Patch0004: Update-config.guess-and-config.sub.patch Patch0005: fix-CVE-2024-31449.patch +Patch0006: fix-CVE-2025-49844.patch BuildRequires: gcc %if %{with tests} @@ -94,6 +95,7 @@ tar -xvf %{SOURCE10} %patch0004 -p1 %endif %patch0005 -p1 +%patch0006 -p1 mv ../%{Pname}-doc-%{doc_commit} doc mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/hiredis/COPYING COPYING-hiredis @@ -198,6 +200,9 @@ exit 0 %{_docdir}/%{Pname} %changelog +* Thu Oct 09 2025 wangziliang - 5.0.14-6 +- fix cve:CVE-2025-49844 + * Tue Sep 02 2025 wangkai <13474090681@163.com> - 5.0.14-5 - License compliance rectification -- Gitee