ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 18:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix attempt for laf string compare transform

Browse Source
This commit is contained in:
vanhauser-thc
2023-09-02 15:48:29 +02:00
parent 1604351368
commit dad56abc85
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
instrumentation/compare-transform-pass.so.cc
View File

@ -169,6 +169,7 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
DenseMap<Value *, std::string *> valueMap; DenseMap<Value *, std::string *> valueMap;
std::vector<CallInst *> calls; std::vector<CallInst *> calls;
LLVMContext &C = M.getContext(); LLVMContext &C = M.getContext();
IntegerType *Int1Ty = IntegerType::getInt1Ty(C);
IntegerType *Int8Ty = IntegerType::getInt8Ty(C); IntegerType *Int8Ty = IntegerType::getInt8Ty(C);
IntegerType *Int32Ty = IntegerType::getInt32Ty(C); IntegerType *Int32Ty = IntegerType::getInt32Ty(C);
IntegerType *Int64Ty = IntegerType::getInt64Ty(C); IntegerType *Int64Ty = IntegerType::getInt64Ty(C);
@ -229,7 +230,8 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
!FuncName.compare("xmlStrEqual") || !FuncName.compare("xmlStrEqual") ||
!FuncName.compare("g_strcmp0") || !FuncName.compare("g_strcmp0") ||
!FuncName.compare("curl_strequal") || !FuncName.compare("curl_strequal") ||
!FuncName.compare("strcsequal")); !FuncName.compare("strcsequal") ||
!FuncName.compare("g_strcmp0"));
isMemcmp &= isMemcmp &=
(!FuncName.compare("memcmp") || !FuncName.compare("bcmp") || (!FuncName.compare("memcmp") || !FuncName.compare("bcmp") ||
!FuncName.compare("CRYPTO_memcmp") || !FuncName.compare("CRYPTO_memcmp") ||
@ -238,7 +240,8 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
!FuncName.compare("memcmpct")); !FuncName.compare("memcmpct"));
isStrncmp &= (!FuncName.compare("strncmp") || isStrncmp &= (!FuncName.compare("strncmp") ||
!FuncName.compare("xmlStrncmp") || !FuncName.compare("xmlStrncmp") ||
!FuncName.compare("curl_strnequal")); !FuncName.compare("curl_strnequal") ||
!FuncName.compare("xmlStrncmp"));
isStrcasecmp &= (!FuncName.compare("strcasecmp") || isStrcasecmp &= (!FuncName.compare("strcasecmp") ||
!FuncName.compare("stricmp") || !FuncName.compare("stricmp") ||
!FuncName.compare("ap_cstr_casecmp") || !FuncName.compare("ap_cstr_casecmp") ||
@ -457,6 +460,7 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
bool isSizedcmp = false; bool isSizedcmp = false;
bool isCaseInsensitive = false; bool isCaseInsensitive = false;
bool needs_null = false; bool needs_null = false;
bool success_is_one = false;
Function *Callee = callInst->getCalledFunction(); Function *Callee = callInst->getCalledFunction();
if (Callee) { if (Callee) {
@ -503,6 +507,14 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
!Callee->getName().compare("g_strncasecmp")) !Callee->getName().compare("g_strncasecmp"))
isCaseInsensitive = true; isCaseInsensitive = true;
if (!Callee->getName().compare("xmlStrEqual") ||
!Callee->getName().compare("g_strcmp0") ||
!Callee->getName().compare("curl_strequal") ||
!Callee->getName().compare("strcsequal") ||
!Callee->getName().compare("xmlStrncmp") ||
!Callee->getName().compare("curl_strnequal"))
success_is_one = true;
} }
if (!isSizedcmp) needs_null = true; if (!isSizedcmp) needs_null = true;
@ -667,6 +679,14 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
else else
isub = cur_cmp_IRB.CreateSub(load, ConstantInt::get(Int8Ty, c)); isub = cur_cmp_IRB.CreateSub(load, ConstantInt::get(Int8Ty, c));
if (success_is_one && i == unrollLen - 1) {
Value *isubsub = cur_cmp_IRB.CreateTrunc(isub, Int1Ty);
isub = cur_cmp_IRB.CreateSelect(isubsub, ConstantInt::get(Int8Ty, 0),
ConstantInt::get(Int8Ty, 1));
}
Value *sext = cur_cmp_IRB.CreateSExt(isub, Int32Ty); Value *sext = cur_cmp_IRB.CreateSExt(isub, Int32Ty);
PN->addIncoming(sext, cur_cmp_bb); PN->addIncoming(sext, cur_cmp_bb);