mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

fix

Browse source
This commit is contained in:
suyuan 2022-08-07 13:10:33 +08:00
parent 298a42ee6a
commit e6525c54a6
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xtables-addons/Makefile
View file

@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons PKG_NAME:=xtables-addons
PKG_VERSION:=3.18 PKG_VERSION:=3.13
PKG_RELEASE:=4 PKG_RELEASE:=4
PKG_HASH:=a77914a483ff381663f52120577e5e9355ca07cca73958b038e09d91247458d5 PKG_HASH:=893c0c4ea09759cda1ab7e68f1281d125e59270f7b59e446204ce686c6a76d65
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/ PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/

10
xtables-addons/patches/200-add-lua-packetscript.patch
View file

@ -17927,7 +17927,7 @@
+ +
+ L = lua_envs[info->state_id]->L; + L = lua_envs[info->state_id]->L;
+ +
+ if (!skb_make_writable(pskb, pskb->len)) + if (!skb_ensure_writable(pskb, pskb->len))
+ return NF_DROP; + return NF_DROP;
+ +
+ /* call the function provided by --function parameter or the default 'process_packet' defined in Lua */ + /* call the function provided by --function parameter or the default 'process_packet' defined in Lua */
@ -17984,7 +17984,7 @@
+ int32_t ret; + int32_t ret;
+ struct lua_env * env = kmalloc(sizeof(struct lua_env), GFP_KERNEL); + struct lua_env * env = kmalloc(sizeof(struct lua_env), GFP_KERNEL);
+ +
+ if (!script_size > 0) { + if (!(script_size > 0)) {
+ pr_debug("LUA [%d]: script_size %lu < 0\n", state_id, script_size); + pr_debug("LUA [%d]: script_size %lu < 0\n", state_id, script_size);
+ return false; + return false;
+ } + }
@ -18134,7 +18134,7 @@
+ +
--- a/extensions/Kbuild --- a/extensions/Kbuild
+++ b/extensions/Kbuild +++ b/extensions/Kbuild
@@ -28,6 +28,7 @@ obj-${build_pknock} += pknock/ @@ -27,6 +27,7 @@ obj-${build_pknock} += pknock/
obj-${build_psd} += xt_psd.o obj-${build_psd} += xt_psd.o
obj-${build_quota2} += xt_quota2.o obj-${build_quota2} += xt_quota2.o
obj-${build_rtsp} += rtsp/ obj-${build_rtsp} += rtsp/
@ -18144,14 +18144,14 @@
-include ${M}/Kbuild.* -include ${M}/Kbuild.*
--- a/extensions/Mbuild --- a/extensions/Mbuild
+++ b/extensions/Mbuild +++ b/extensions/Mbuild
@@ -23,3 +23,4 @@ obj-${build_pknock} += pknock/ @@ -22,3 +22,4 @@ obj-${build_pknock} += pknock/
obj-${build_psd} += libxt_psd.so obj-${build_psd} += libxt_psd.so
obj-${build_quota2} += libxt_quota2.so obj-${build_quota2} += libxt_quota2.so
obj-${build_gradm} += libxt_gradm.so obj-${build_gradm} += libxt_gradm.so
+obj-${build_LUA} += LUA/ +obj-${build_LUA} += LUA/
--- a/mconfig --- a/mconfig
+++ b/mconfig +++ b/mconfig
@@ -24,3 +24,4 @@ build_pknock=m @@ -23,3 +23,4 @@ build_pknock=m
build_psd=m build_psd=m
build_quota2=m build_quota2=m
build_rtsp=m build_rtsp=m

9
xtables-addons/patches/201-fix-lua-packetscript.patch
View file

@ -22,15 +22,6 @@
{ {
uint32_t verdict; uint32_t verdict;
lua_packet_segment *p; lua_packet_segment *p;
@@ -79,7 +79,7 @@ lua_tg(struct sk_buff *pskb, const struc
L = lua_envs[info->state_id]->L;
- if (!skb_make_writable(pskb, pskb->len))
+ if (skb_ensure_writable(pskb, pskb->len))
return NF_DROP;
/* call the function provided by --function parameter or the default 'process_packet' defined in Lua */
@@ -88,11 +88,11 @@ lua_tg(struct sk_buff *pskb, const struc @@ -88,11 +88,11 @@ lua_tg(struct sk_buff *pskb, const struc
/* push the lua_packet_segment as a parameter */ /* push the lua_packet_segment as a parameter */
p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment)); p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));