298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: fix CVE-2014-5461 (Buffer overflow)

Browse Source 
Patch taken from Debian.

Refresh patches

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-02-11 15:06:40 -08:00
parent 991451d002
commit 02c176caaf
8 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/utils/lua/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lua PKG_NAME:=lua
PKG_VERSION:=5.1.5 PKG_VERSION:=5.1.5
PKG_RELEASE:=10 PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.lua.org/ftp/ \ PKG_SOURCE_URL:=https://www.lua.org/ftp/ \

3
package/utils/lua/patches-host/001-include-version-number.patch
View File

@ -8,7 +8,6 @@ Including it allows multiple lua versions to coexist.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- ---
diff --git a/Makefile b/Makefile
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -41,10 +41,10 @@ RANLIB= ranlib @@ -41,10 +41,10 @@ RANLIB= ranlib
@ -42,7 +41,7 @@ rename to doc/luac5.1.1
diff --git a/src/Makefile b/src/Makefile diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ @@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ld
LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
lstrlib.o loadlib.o linit.o lstrlib.o loadlib.o linit.o

11
package/utils/lua/patches-host/013-lnum-strtoul-parsing-fixes.patch
View File

@ -1,8 +1,6 @@
diff --git a/src/lnum.c b/src/lnum.c
index 1456b6a2ed23..b0632b04c2b7 100644
--- a/src/lnum.c --- a/src/lnum.c
+++ b/src/lnum.c +++ b/src/lnum.c
@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) { @@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lu
#else #else
return 0; /* Reject the number */ return 0; /* Reject the number */
#endif #endif
@ -11,7 +9,7 @@ index 1456b6a2ed23..b0632b04c2b7 100644
} }
} else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) { } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */ return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */
@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) { @@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Inte
return 0; return 0;
} }
@ -25,8 +23,6 @@ index 1456b6a2ed23..b0632b04c2b7 100644
+ return (unsigned LUA_INTEGER)v; + return (unsigned LUA_INTEGER)v;
+} +}
+#endif +#endif
diff --git a/src/lnum_config.h b/src/lnum_config.h
index 19d7a4231a49..1092eead6629 100644
--- a/src/lnum_config.h --- a/src/lnum_config.h
+++ b/src/lnum_config.h +++ b/src/lnum_config.h
@@ -141,7 +141,12 @@ @@ -141,7 +141,12 @@
@ -43,6 +39,3 @@ index 19d7a4231a49..1092eead6629 100644
#endif #endif
#ifndef LUA_INTEGER_MIN #ifndef LUA_INTEGER_MIN
# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */ # define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */
--
1.9.1

6
package/utils/lua/patches-host/100-no_readline.patch
View File

@ -10,7 +10,7 @@
#if defined(LUA_USE_MACOSX) #if defined(LUA_USE_MACOSX)
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@ LIBS= -lm $(MYLIBS)
MYCFLAGS= MYCFLAGS=
MYLDFLAGS= MYLDFLAGS=
MYLIBS= MYLIBS=
@ -18,7 +18,7 @@
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
@@ -75,7 +76,7 @@ @@ -75,7 +76,7 @@ echo:
@echo "MYLIBS = $(MYLIBS)" @echo "MYLIBS = $(MYLIBS)"
# convenience targets for popular platforms # convenience targets for popular platforms
@ -27,7 +27,7 @@
none: none:
@echo "Please choose a platform:" @echo "Please choose a platform:"
@echo " $(PLATS)" @echo " $(PLATS)"
@@ -90,16 +91,16 @@ @@ -90,16 +91,16 @@ bsd:
$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E" $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
freebsd: freebsd:

19
package/utils/lua/patches-host/400-CVE-2014-5461.patch Normal file
View File

@ -0,0 +1,19 @@
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Tue, 26 Aug 2014 16:20:55 +0200
Subject: Fix stack overflow in vararg functions
---
src/ldo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/ldo.c
+++ b/src/ldo.c
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId fu
CallInfo *ci;
StkId st, base;
Proto *p = cl->p;
- luaD_checkstack(L, p->maxstacksize);
+ luaD_checkstack(L, p->maxstacksize + p->numparams);
func = restorestack(L, funcr);
if (!p->is_vararg) { /* no varargs? */
base = func + 1;

3
package/utils/lua/patches/001-include-version-number.patch
View File

@ -8,7 +8,6 @@ Including it allows multiple lua versions to coexist.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- ---
diff --git a/Makefile b/Makefile
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -41,10 +41,10 @@ RANLIB= ranlib @@ -41,10 +41,10 @@ RANLIB= ranlib
@ -42,7 +41,7 @@ rename to doc/luac5.1.1
diff --git a/src/Makefile b/src/Makefile diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ @@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ld
LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
lstrlib.o loadlib.o linit.o lstrlib.o loadlib.o linit.o

11
package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch
View File

@ -1,8 +1,6 @@
diff --git a/src/lnum.c b/src/lnum.c
index 1456b6a2ed23..b0632b04c2b7 100644
--- a/src/lnum.c --- a/src/lnum.c
+++ b/src/lnum.c +++ b/src/lnum.c
@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) { @@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lu
#else #else
return 0; /* Reject the number */ return 0; /* Reject the number */
#endif #endif
@ -11,7 +9,7 @@ index 1456b6a2ed23..b0632b04c2b7 100644
} }
} else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) { } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */ return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */
@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) { @@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Inte
return 0; return 0;
} }
@ -25,8 +23,6 @@ index 1456b6a2ed23..b0632b04c2b7 100644
+ return (unsigned LUA_INTEGER)v; + return (unsigned LUA_INTEGER)v;
+} +}
+#endif +#endif
diff --git a/src/lnum_config.h b/src/lnum_config.h
index 19d7a4231a49..1092eead6629 100644
--- a/src/lnum_config.h --- a/src/lnum_config.h
+++ b/src/lnum_config.h +++ b/src/lnum_config.h
@@ -141,7 +141,12 @@ @@ -141,7 +141,12 @@
@ -43,6 +39,3 @@ index 19d7a4231a49..1092eead6629 100644
#endif #endif
#ifndef LUA_INTEGER_MIN #ifndef LUA_INTEGER_MIN
# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */ # define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */
--
1.9.1

19
package/utils/lua/patches/400-CVE-2014-5461.patch Normal file
View File

@ -0,0 +1,19 @@
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Tue, 26 Aug 2014 16:20:55 +0200
Subject: Fix stack overflow in vararg functions
---
src/ldo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/ldo.c
+++ b/src/ldo.c
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId fu
CallInfo *ci;
StkId st, base;
Proto *p = cl->p;
- luaD_checkstack(L, p->maxstacksize);
+ luaD_checkstack(L, p->maxstacksize + p->numparams);
func = restorestack(L, funcr);
if (!p->is_vararg) { /* no varargs? */
base = func + 1;