github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-19 06:19:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

more fix of memory access

Browse Source
This commit is contained in:
root 2020-07-26 19:07:17 +00:00
parent 5f907e32d7
commit e8daf7c263
6 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client.cpp
View File

@ -485,6 +485,11 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
{ {
return -1; return -1;
} }
if(data_len>=max_data_len+1)
{
mylog(log_debug,"data_len=%d >= max_data_len+1,ignored",data_len);
return -1;
}
if(!recv_info.new_src_ip.equal(send_info.new_dst_ip)||recv_info.src_port!=send_info.dst_port) if(!recv_info.new_src_ip.equal(send_info.new_dst_ip)||recv_info.src_port!=send_info.dst_port)
{ {
mylog(log_debug,"unexpected adress %s %s %d %d\n",recv_info.new_src_ip.get_str1(),send_info.new_dst_ip.get_str2(),recv_info.src_port,send_info.dst_port); mylog(log_debug,"unexpected adress %s %s %d %d\n",recv_info.new_src_ip.get_str1(),send_info.new_dst_ip.get_str2(),recv_info.src_port,send_info.dst_port);

9
connection.cpp
View File

@ -416,6 +416,13 @@ int recv_bare(raw_info_t &raw_info,char* & data,int & len)//recv function with e
//printf("recv_raw_fail in recv bare\n"); //printf("recv_raw_fail in recv bare\n");
return -1; return -1;
} }
if(len>=max_data_len+1)
{
mylog(log_debug,"data_len=%d >= max_data_len+1,ignored",len);
return -1;
}
mylog(log_trace,"data len=%d\n",len); mylog(log_trace,"data len=%d\n",len);
if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1))) if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1)))
{ {
@ -615,7 +622,7 @@ int reserved_parse_safer(conn_info_t &conn_info,const char * input,int input_len
} }
if(after_recv_raw0(conn_info.raw_info)!=0) return -1; if(after_recv_raw0(conn_info.raw_info)!=0) return -1; //TODO might need to move this function to somewhere else after --fix-gro is introduced
return 0; return 0;
} }

3
makefile
View File

@ -19,7 +19,6 @@ PCAP="-lpcap"
MP="-DUDP2RAW_MP" MP="-DUDP2RAW_MP"
NAME=udp2raw NAME=udp2raw
TARGETS=amd64 arm amd64_hw_aes arm_asm_aes mips24kc_be mips24kc_be_asm_aes x86 x86_asm_aes mips24kc_le mips24kc_le_asm_aes TARGETS=amd64 arm amd64_hw_aes arm_asm_aes mips24kc_be mips24kc_be_asm_aes x86 x86_asm_aes mips24kc_le mips24kc_le_asm_aes
@ -59,7 +58,7 @@ debug: git_version
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -D MY_DEBUG ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -D MY_DEBUG
debug2: git_version debug2: git_version
rm -f ${NAME} rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb -fsanitize=address
#targets only for 'make release' #targets only for 'make release'

2
network.cpp
View File

@ -1441,7 +1441,7 @@ int pre_recv_raw_packet()
} }
} }
if(g_packet_buf_len> max_data_len+1) if(g_packet_buf_len>= max_data_len+1)
{ {
if(g_fix_gro==0) if(g_fix_gro==0)
{ {

4
pcap_wrapper.h
View File

@ -9,12 +9,12 @@
struct bpf_program struct bpf_program
{ {
char a[2000]; char a[4096];
}; };
struct pcap_t struct pcap_t
{ {
char a[2000]; char a[4096];
}; };
typedef unsigned int bpf_u_int32; typedef unsigned int bpf_u_int32;

5
server.cpp
View File

@ -460,6 +460,11 @@ int server_on_raw_recv_multi() //called when server received an raw packet
{ {
return 0; return 0;
} }
if(data_len>=max_data_len+1)
{
mylog(log_debug,"data_len=%d >= max_data_len+1,ignored",data_len);
return -1;
}
if(use_tcp_dummy_socket!=0) if(use_tcp_dummy_socket!=0)
return 0; return 0;
raw_info_t &raw_info=tmp_raw_info; raw_info_t &raw_info=tmp_raw_info;