nfqws2: join fragments in quic CRYPTO reconstruction. allow intersections

.github/workflows/build.yml

@@ -250,6 +250,7 @@ jobs:
             arm64-v8a)
               # not safe without GC64
               SYSMALLOC=
+              PAGESIZE="-Wl,-z,max-page-size=16384"
               ;;
           esac
 
@@ -290,7 +291,7 @@ jobs:
 
           # zapret2
           CFLAGS="-DZAPRET_GH_VER=${{ github.ref_name }} -DZAPRET_GH_HASH=${{ github.sha }} -I$DEPS_DIR/include $CPU" \
-          LDFLAGS="-L$DEPS_DIR/lib" \
+          LDFLAGS="-L$DEPS_DIR/lib $PAGESIZE" \
           make -C zapret2 LUA_JIT=$LJIT LUA_CFLAGS="$LCFLAGS" LUA_LIB="$LLIB" -j$(nproc) android
 
           # strip unwanted ELF sections to prevent warnings on old Android versions

docs/changes.txt

@@ -270,5 +270,6 @@ v0.9.4.3
 0.9.4.5
 
 * github: rollback to lj_alloc in luajit for arm64 and mips64
+* github: use 16K page size for android arm64 build
 * nfqws2: join fragments in quic CRYPTO reconstruction. allow intersections.
 

nfq2/protocol.c

@@ -1269,7 +1269,7 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
 	uint8_t *defrag_data = defrag+10;
 	size_t defrag_data_len = *defrag_len-10;
 	uint8_t ft;
-	uint64_t offset,sz,szmax=0,zeropos=0,pos=0,r1,r2;
+	uint64_t offset,sz,szmax=0,zeropos=0,pos=0;
 	bool found=false;
 	struct range64 ranges[MAX_DEFRAG_PIECES];
 	int i,j,range=0;
@@ -1294,26 +1294,26 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
 			if ((pos+sz)>clean_len) return false;
 
 			if ((offset+sz)>defrag_data_len) return false; // defrag buf overflow
+
+			// remove exact duplicates early to save cpu
+			for(i=0;i<range;i++)
+				if (ranges[i].offset==offset && ranges[i].len==sz)
+					goto skip_range;
+
 			if (zeropos < offset)
 				// make sure no uninitialized gaps exist in case of not full fragment coverage
 				memset(defrag_data+zeropos,0,offset-zeropos);
 			if ((offset+sz) > zeropos)
 				zeropos=offset+sz;
 
-			memcpy(defrag_data+offset,clean+pos,sz);
-			if ((offset+sz) > szmax) szmax = offset+sz;
-
 			found=true;
-			pos+=sz;
-
-			// remove exact duplicates early to save cpu
-			for(i=0;i<range;i++)
-				if (ranges[i].offset==offset && ranges[i].len==sz)
-					continue;
-
+			if ((offset+sz) > szmax) szmax = offset+sz;
+			memcpy(defrag_data+offset,clean+pos,sz);
 			ranges[range].offset = offset;
 			ranges[range].len = sz;
 			range++;
+skip_range:
+			pos+=sz;
 		}
 	}
 	if (found)
@@ -1373,6 +1373,8 @@ bool IsQUICInitial(const uint8_t *data, size_t len)
 	if (data[offset] > QUIC_MAX_CID_LENGTH) return false;
 	offset += 1 + data[offset];
 
+	if (offset>=len) return false;
+
 	// SCID
 	if (data[offset] > QUIC_MAX_CID_LENGTH) return false;
 	offset += 1 + data[offset];