gfwleak/tango-kni
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
崔一鸣
2019-06-08 20:32:58 +08:00
parent 040be1c93e 50cfdc6477
commit bfc9e83fd5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -8,7 +8,8 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set (CMAKE_CXX_FLAGS "-Wall") set (CMAKE_CXX_FLAGS "-Wall")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lasan -fsanitize-recover=address -fsanitize=address -fno-omit-frame-pointer") #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lasan -fsanitize-recover=address -fsanitize=address -fno-omit-frame-pointer")
add_definitions(-D_GNU_SOURCE) add_definitions(-D_GNU_SOURCE)
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)

2
entry/src/kni_maat.cpp
View File

@@ -180,7 +180,7 @@ static int index_of_enforce_policy(struct Maat_rule_t* result, size_t size)
int biggest_policy_id=0, ret_intercept_idx=0; int biggest_policy_id=0, ret_intercept_idx=0;
for(i=0; i<size; i++) for(i=0; i<size; i++)
{ {
if(result[i].action==KNI_ACTION_BYPASS) if((unsigned char)result[i].action==KNI_ACTION_BYPASS)
{ {
return i; return i;
} }