Skip to content
Snippets Groups Projects
Commit b28130c8 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

fixed fix-calls to optionally pin return addresses

parent 8e4c3445
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
irdb-libs/ir_builders/fix_calls.cpp
+ 913
− 912
View file @ b28130c8
......@@ -46,1056 +46,1057 @@ extern void read_ehframe(FileIR_t* firp, EXEIO::exeio* );
class FixCalls_t : public TransformStep_t
{
const bool opt_fix_no_func_target=false;
const bool opt_fix_no_target = false;
private:
const bool opt_fix_no_func_target = false;
const bool opt_fix_no_target = false;
public:
class Range_t
{
public:
Range_t(VirtualOffset_t p_s, VirtualOffset_t p_e) : m_start(p_s), m_end(p_e) { }
Range_t() : m_start(0), m_end(0) { }
class Range_t
{
public:
Range_t(VirtualOffset_t p_s, VirtualOffset_t p_e) : m_start(p_s), m_end(p_e) { }
Range_t() : m_start(0), m_end(0) { }
virtual VirtualOffset_t getStart() const { return m_start; }
virtual VirtualOffset_t getEnd() const { return m_end; }
virtual void setStart(VirtualOffset_t s) { m_start=s; }
virtual void setEnd(VirtualOffset_t e) { m_end=e; }
virtual VirtualOffset_t getStart() const { return m_start; }
virtual VirtualOffset_t getEnd() const { return m_end; }
virtual void setStart(VirtualOffset_t s) { m_start=s; }
virtual void setEnd(VirtualOffset_t e) { m_end=e; }
protected:
protected:
VirtualOffset_t m_start, m_end;
};
VirtualOffset_t m_start, m_end;
};
struct Range_tCompare
{
bool operator() (const Range_t &first, const Range_t &second) const
{
return first.getEnd() < second.getStart();
}
};
using Rangeset_t = std::set<Range_t, Range_tCompare>;
Rangeset_t eh_frame_ranges;
size_t no_target_insn=0;
size_t no_fallthrough_insn=0;
size_t target_not_in_function=0;
size_t call_to_not_entry=0;
size_t thunk_check=0;
size_t found_pattern=0;
size_t in_ehframe=0;
size_t no_fix_for_ib=0;
size_t no_fix_for_safefn=0;
size_t other_fixes=0;
size_t fixed_calls=0;
size_t not_fixed_calls=0;
size_t not_calls=0;
bool opt_fix_icalls = false;
bool opt_fix_safefn = true;
bool check_entry(bool &found, ControlFlowGraph_t* cfg)
{
struct Range_tCompare
{
bool operator() (const Range_t &first, const Range_t &second) const
{
return first.getEnd() < second.getStart();
}
};
using Rangeset_t = set<Range_t, Range_tCompare>;
Rangeset_t eh_frame_ranges;
size_t no_target_insn=0;
size_t no_fallthrough_insn=0;
size_t target_not_in_function=0;
size_t call_to_not_entry=0;
size_t thunk_check=0;
size_t found_pattern=0;
size_t in_ehframe=0;
size_t no_fix_for_ib=0;
size_t no_fix_for_safefn=0;
size_t other_fixes=0;
size_t fixed_calls=0;
size_t not_fixed_calls=0;
size_t not_calls=0;
bool opt_fix_icalls = false;
bool opt_fix_safefn = true;
bool check_entry(bool &found, ControlFlowGraph_t* cfg)
{
auto entry=cfg->getEntry();
found=false;
auto entry=cfg->getEntry();
found=false;
for(auto insn : entry->getInstructions())
{
auto disasmp = DecodedInstruction_t::factory(insn);
auto &disasm = *disasmp;
if(disasm.setsStackPointer()) {
return false;
} else {
if(getenv("VERBOSE_FIX_CALLS"))
for(auto insn : entry->getInstructions())
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"check_entry: does not set stack pointer?"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
auto disasmp = DecodedInstruction_t::factory(insn);
auto &disasm = *disasmp;
if(disasm.setsStackPointer()) {
return false;
} else {
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout << "check_entry: does not set stack pointer?" << " address="
<< hex << addr << ": " << insn->getDisassembly() << endl;
}
}
if(strstr(disasm.getDisassembly().c_str(), "[esp]"))
{
found=true;
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout << "Needs fix (check_entry): [esp]" << " address="
<< hex << addr << ": " << insn->getDisassembly() << endl;
}
return true;
}
}
return false;
}
if(strstr(disasm.getDisassembly().c_str(), "[esp]"))
using ControlFlowGraphMap_t = map<Function_t*, shared_ptr<ControlFlowGraph_t> >;
ControlFlowGraphMap_t cfg_optimizer;
bool call_needs_fix(Instruction_t* insn)
{
found=true;
if(getenv("VERBOSE_FIX_CALLS"))
for(auto reloc : insn->getRelocations())
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix (check_entry): [esp]"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
if(string("safefr") == reloc->getType())
return false;
}
return true;
}
}
return false;
}
const auto target=insn->getTarget();
const auto fallthru=insn->getFallthrough();
using ControlFlowGraphMap_t = map<Function_t*, shared_ptr<ControlFlowGraph_t> >;
ControlFlowGraphMap_t cfg_optimizer;
// string pattern;
bool call_needs_fix(Instruction_t* insn)
{
for(auto reloc : insn->getRelocations())
{
if(string("safefr") == reloc->getType())
return false;
}
// this used to work because fill_in_indirects would mark IBTs
// while reading the ehframe, which perfectly corresponds to when
// we need to fix calls due to eh_frame. However, now STARS also marks
// return points as IBTs, so we need to re-parse the ehframe and use that instead.
const auto target=insn->getTarget();
const auto fallthru=insn->getFallthrough();
/* no fallthrough instruction, something is odd here */
if(!fallthru)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout << "Needs fix: No fallthrough" << " address="
<< hex << addr << ": " << insn->getDisassembly() << endl;
}
no_fallthrough_insn++;
return true;
}
// string pattern;
const auto addr=fallthru->getAddress()->getVirtualOffset();
const auto rangeiter=eh_frame_ranges.find(Range_t(addr,addr));
if(rangeiter != eh_frame_ranges.end()) // found an eh_frame addr entry for this call
{
in_ehframe++;
return true;
}
// this used to work because fill_in_indirects would mark IBTs
// while reading the ehframe, which perfectly corresponds to when
// we need to fix calls due to eh_frame. However, now STARS also marks
// return points as IBTs, so we need to re-parse the ehframe and use that instead.
if (!opt_fix_icalls && insn->getIBTargets() && insn->getIBTargets()->size() > 0)
{
/* do not fix indirect calls */
no_fix_for_ib++;
return false;
}
/* no fallthrough instruction, something is odd here */
if(!fallthru)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: No fallthrough"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
}
no_fallthrough_insn++;
return true;
}
const auto addr=fallthru->getAddress()->getVirtualOffset();
const auto rangeiter=eh_frame_ranges.find(Range_t(addr,addr));
if(rangeiter != eh_frame_ranges.end()) // found an eh_frame addr entry for this call
{
in_ehframe++;
return true;
}
if (!opt_fix_icalls && insn->getIBTargets() && insn->getIBTargets()->size() > 0)
{
/* do not fix indirect calls */
no_fix_for_ib++;
return false;
}
/* if the target isn't in the IR */
if(!target)
{
/* call 0's aren't to real locations */
const auto disasm=DecodedInstruction_t::factory(insn);
if(disasm->getOperand(0)->isConstant() && disasm->getAddress()==0)
{
return false;
}
no_target_insn++;
/* if the target isn't in the IR */
if(!target)
{
/* call 0's aren't to real locations */
const auto disasm=DecodedInstruction_t::factory(insn);
if(disasm->getOperand(0)->isConstant() && disasm->getAddress()==0)
{
return false;
}
no_target_insn++;
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: No target instruction"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
}
// then we might need to fix it
// but typically, we don't fix it because it's not really a valid isntruction.
return opt_fix_no_target;
}
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout << "Needs fix: No target instruction" << " address="
<< hex << addr << ": " << insn->getDisassembly() << endl;
}
// then we might need to fix it
// but typically, we don't fix it because it's not really a valid isntruction.
return opt_fix_no_target;
}
/*
* if the location after the call is marked as an IBT, then
* this location might be used for walking the stack
*/
/*
* if the location after the call is marked as an IBT, then
* this location might be used for walking the stack
*/
const auto func=target->getFunction();
const auto func=target->getFunction();
/* if there's no function for this instruction */
if(!func)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: Target not in a function"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
}
target_not_in_function++;
/* we need to fix it */
return opt_fix_no_func_target;
}
/* if there's no function for this instruction */
if(!func)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: Target not in a function"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
}
target_not_in_function++;
/* we need to fix it */
return opt_fix_no_func_target;
}
const auto is_found_it=cfg_optimizer.find(func);
const auto is_found=(is_found_it!=end(cfg_optimizer));
const auto is_found_it=cfg_optimizer.find(func);
const auto is_found=(is_found_it!=end(cfg_optimizer));
if(!is_found)
/* build a cfg for this function */
cfg_optimizer[func]=shared_ptr<ControlFlowGraph_t>(move(ControlFlowGraph_t::factory(func)));
if(!is_found)
/* build a cfg for this function */
cfg_optimizer[func]=shared_ptr<ControlFlowGraph_t>(move(ControlFlowGraph_t::factory(func)));
auto cfg=cfg_optimizer[func].get();
auto cfg=cfg_optimizer[func].get();
assert(cfg->getEntry());
/* if the call instruction isn't to a function entry point */
if(cfg->getEntry()->getInstructions()[0]!=target)
{
call_to_not_entry++;
/* then we need to fix it */
return true;
}
assert(cfg->getEntry());
/* if the call instruction isn't to a function entry point */
if(cfg->getEntry()->getInstructions()[0]!=target)
{
call_to_not_entry++;
/* then we need to fix it */
return true;
}
/* check the entry block for thunks, etc. */
auto found=false;
bool ret=check_entry(found,cfg);
// delete cfg;
if(found)
{
if(ret)
{
if(getenv("VERBOSE_FIX_CALLS"))
/* check the entry block for thunks, etc. */
auto found=false;
bool ret=check_entry(found,cfg);
// delete cfg;
if(found)
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: (via check_entry) Thunk detected"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
if(ret)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
VirtualOffset_t addr = 0;
if (insn->getAddress())
addr = insn->getAddress()->getVirtualOffset();
cout<<"Needs fix: (via check_entry) Thunk detected"<< " address="
<<hex<<addr<<": "<<insn->getDisassembly()<<endl;
}
thunk_check++;
}
return ret;
}
thunk_check++;
}
return ret;
}
/* otherwise, we think it's safe */
return false;
/* otherwise, we think it's safe */
return false;
}
}
/*
* - adjust_esp_offset - take newbits, and determine if it has an esp+K type offset in a memory address.
* if so, adjust k by offset, and return the new string.
*/
string adjust_esp_offset(string newbits, int offset)
{
/*
* - adjust_esp_offset - take newbits, and determine if it has an esp+K type offset in a memory address.
* if so, adjust k by offset, and return the new string.
*/
string adjust_esp_offset(string newbits, int offset)
{
/*
* call has opcodes of:
* E8 cw call near, relative, displacement relative to next instruction
* E8 cd call near, relative, displacement relative to next instruction
* FF /2 call near, absolute indirect, address given in r/m16
* FF /2 call near, absolute indirect, address given in r/m32
* 9a cd call far, absolute, address given in operand
* 9a cp call far, absolute, address given in operand
* FF /3 call far, absolute indirect, address given in m16:16
* FF /3 call far, absolute indirect, address given in m16:32
*
* FF /4 jmp near, absolute indirect, address given in r/m16
* FF /4 jmp near, absolute indirect, address given in r/m32
* FF /5 jmp near, absolute indirect, address given in r/m16
* FF /5 jmp near, absolute indirect, address given in r/m32
*
* /digit indicates that the Reg/Opcode field (bits 3-5) of the ModR/M byte (opcode[1])
* contains that value as an opcode instead of a register operand indicator. The instruction only
* uses the R/M field (bits 0-2) as an operand.
*
* cb,cw,cd,cp indicates a 1,2,4,6-byte following the opcode is used to specify a
* code offset and possibly a new code segment
*
* I believe we only care about these this version:
* FF /3 call far, absolute indirect, address given in m16:32
* as we're looking for an address on the stack.
*
* The ModR/M byte must be Mod=10, Reg/Op=010, R/M=100 aka 0x94 or possibly
* Mod=01, Reg/Op=100, R/M=100 aka 0x64 or possibly
* Mod=10, Reg/Op=100, R/M=100 aka 0xa4 or possibly
* Mod=01, Reg/Op=010, R/M=100 aka 0x54 or possibly
* R/M=100 indicates to read the SIB (see below)
* Mod=10 indicates an 32-bit displacement after the SIB byte
* Mod=01 indicates an 8-bit displacement after the SIB byte
* Reg/Op=010 indicates an opcode that has a /3 after it
* Reg/Op=100 indicates an opcode that has a /5 after it
*
* The SIB byte (opcode[2]) needs to be scale=00, index=100, base=100, or 0x24
* indicating that the addresing mode is 0*%esp+%esp.
*
* I believe that the SIB byte could also be 0x64, 0xA4, or 0xE4, but that
* these are very rarely used as they are redundant.
*
*
*
*
*/
/* non-negative offsets please */
assert(offset>=0);
/*
* call has opcodes of:
* E8 cw call near, relative, displacement relative to next instruction
* E8 cd call near, relative, displacement relative to next instruction
* FF /2 call near, absolute indirect, address given in r/m16
* FF /2 call near, absolute indirect, address given in r/m32
* 9a cd call far, absolute, address given in operand
* 9a cp call far, absolute, address given in operand
* FF /3 call far, absolute indirect, address given in m16:16
* FF /3 call far, absolute indirect, address given in m16:32
*
* FF /4 jmp near, absolute indirect, address given in r/m16
* FF /4 jmp near, absolute indirect, address given in r/m32
* FF /5 jmp near, absolute indirect, address given in r/m16
* FF /5 jmp near, absolute indirect, address given in r/m32
*
* /digit indicates that the Reg/Opcode field (bits 3-5) of the ModR/M byte (opcode[1])
* contains that value as an opcode instead of a register operand indicator. The instruction only
* uses the R/M field (bits 0-2) as an operand.
*
* cb,cw,cd,cp indicates a 1,2,4,6-byte following the opcode is used to specify a
* code offset and possibly a new code segment
*
* I believe we only care about these this version:
* FF /3 call far, absolute indirect, address given in m16:32
* as we're looking for an address on the stack.
*
* The ModR/M byte must be Mod=10, Reg/Op=010, R/M=100 aka 0x94 or possibly
* Mod=01, Reg/Op=100, R/M=100 aka 0x64 or possibly
* Mod=10, Reg/Op=100, R/M=100 aka 0xa4 or possibly
* Mod=01, Reg/Op=010, R/M=100 aka 0x54 or possibly
* R/M=100 indicates to read the SIB (see below)
* Mod=10 indicates an 32-bit displacement after the SIB byte
* Mod=01 indicates an 8-bit displacement after the SIB byte
* Reg/Op=010 indicates an opcode that has a /3 after it
* Reg/Op=100 indicates an opcode that has a /5 after it
*
* The SIB byte (opcode[2]) needs to be scale=00, index=100, base=100, or 0x24
* indicating that the addresing mode is 0*%esp+%esp.
*
* I believe that the SIB byte could also be 0x64, 0xA4, or 0xE4, but that
* these are very rarely used as they are redundant.
*
*
*
*
*/
/* non-negative offsets please */
assert(offset>=0);
int sib_byte=(unsigned char)newbits[2];
int sib_base=(unsigned char)sib_byte&0x7;
//int sib_ss=(sib_byte>>3)&0x7;
//int sib_index=(sib_byte>>3)&0x7;
/* 32-bit offset */
if ( (unsigned char)newbits[0] == 0xff && /* ff */
((unsigned char)newbits[1] == 0x94 || (unsigned char)newbits[1] == 0x64 ) && /* /2 or /4*/
sib_base == 0x4 ) /* base==esp */
{
// reconstruct the old 32-bit value
int oldval=((unsigned char)newbits[6]<<24)+((unsigned char)newbits[5]<<16)+((unsigned char)newbits[4]<<8)+((unsigned char)newbits[3]);
// add the offset
int newval=oldval+offset;
// break it back apart to store in the string.
newbits[3]=(char)(newval>>0)&0xff;
newbits[4]=(char)(newval>>8)&0xff;
newbits[5]=(char)(newval>>16)&0xff;
newbits[6]=(char)(newval>>24)&0xff;
}
/* 8-bit offset */
else if ( (unsigned char)newbits[0] == 0xff && // ff
((unsigned char)newbits[1] == 0x54 || (unsigned char)newbits[1]==0xa4) && // /3 or /5
sib_base == 0x4 ) // base==esp
{
/* We need to add 4 to the offset, but this may overflow an 8-bit quantity
* (note: there's no 16-bit offset for this insn. Only 8-bit or 32-bit offsets exist for this instr)
* if the const offset is over (0x7f-offset), adding offset will overflow it to be negative instead
* of positive
*/
if((unsigned char)newbits[3]>=(0x7f-offset))
{
/* Careful, adding 4 to this will cause an overflow.
* We need to convert it to a 32-bit displacement
*/
/* first, change addressing mode from 8-bit to 32-bit. */
newbits[1]&=0x3f; /* remove upper 2 bits */
newbits[1]|=0x80; /* make them 10 to indicate a 32-bit offset */
// sign-extend to 32-bit int
int oldval=(char)newbits[3];
// add the offset
int newval=oldval+offset;
// break it back apart to store in the string.
assert(newbits.length() == 4);
newbits[3]=(char)(newval>>0)&0xff;
// 3 most significant bytes extend the instruction
newbits+=(char)(newval>>8)&0xff;
newbits+=(char)(newval>>16)&0xff;
newbits+=(char)(newval>>24)&0xff;
}
else
newbits[3] += (char)offset;
}
return newbits;
}
int sib_byte=(unsigned char)newbits[2];
int sib_base=(unsigned char)sib_byte&0x7;
//int sib_ss=(sib_byte>>3)&0x7;
//int sib_index=(sib_byte>>3)&0x7;
/*
* convert_to_jump - assume newbits is a call insn, convert newbits to a jump, and return it.
* Also: if newbits is a call [esp+k], add "offset" to k.
*/
void convert_to_jump(Instruction_t* insn, int offset)
{
string newbits=insn->getDataBits();
auto dp=DecodedInstruction_t::factory(insn);
auto &d=*dp;
/* this case is odd, handle it specially (and more easily to understand) */
if(strcmp(d.getDisassembly().c_str(), "call qword [rsp]")==0)
{
char buf[100];
sprintf(buf,"jmp qword [rsp+%d]", offset);
insn->assemble(buf);
return;
}
/* skip over any prefixes */
int op_index=d.getPrefixCount(); // d.Prefix.Number;
// on the opcode. assume no prefix here
switch((unsigned char)newbits[op_index])
{
// opcodes: ff /2 and ff /3
case 0xff:
{
// opcode: ff /2
// call r/m32, call near, absolute indirect, address given in r/m32
if(((((unsigned char)newbits[op_index+1])&0x38)>>3) == 2)
/* 32-bit offset */
if ( (unsigned char)newbits[0] == 0xff && /* ff */
((unsigned char)newbits[1] == 0x94 || (unsigned char)newbits[1] == 0x64 ) && /* /2 or /4*/
sib_base == 0x4 ) /* base==esp */
{
newbits=adjust_esp_offset(newbits,offset);
// convert to jmp r/m32
// opcode: FF /4
newbits[op_index+1]&=0xC7; // remove old bits
newbits[op_index+1]|=(0x4<<3); // set r/m field to 4
// reconstruct the old 32-bit value
int oldval=((unsigned char)newbits[6]<<24)+((unsigned char)newbits[5]<<16)+((unsigned char)newbits[4]<<8)+((unsigned char)newbits[3]);
// add the offset
int newval=oldval+offset;
// break it back apart to store in the string.
newbits[3]=(char)(newval>>0)&0xff;
newbits[4]=(char)(newval>>8)&0xff;
newbits[5]=(char)(newval>>16)&0xff;
newbits[6]=(char)(newval>>24)&0xff;
}
// opcode: ff /3
// call m16:32, call far, absolute indirect, address given in m16:32
else if(((((unsigned char)newbits[op_index+1])&0x38)>>3) == 3)
/* 8-bit offset */
else if ( (unsigned char)newbits[0] == 0xff && // ff
((unsigned char)newbits[1] == 0x54 || (unsigned char)newbits[1]==0xa4) && // /3 or /5
sib_base == 0x4 ) // base==esp
{
// convert to jmp m16:32
// opcode: FF /5
newbits[op_index+1]&=0xC7; // remove old bits
newbits[op_index+1]|=(0x5<<3); // set r/m field to 5
/* We need to add 4 to the offset, but this may overflow an 8-bit quantity
* (note: there's no 16-bit offset for this insn. Only 8-bit or 32-bit offsets exist for this instr)
* if the const offset is over (0x7f-offset), adding offset will overflow it to be negative instead
* of positive
*/
if((unsigned char)newbits[3]>=(0x7f-offset))
{
/* Careful, adding 4 to this will cause an overflow.
* We need to convert it to a 32-bit displacement
*/
/* first, change addressing mode from 8-bit to 32-bit. */
newbits[1]&=0x3f; /* remove upper 2 bits */
newbits[1]|=0x80; /* make them 10 to indicate a 32-bit offset */
// sign-extend to 32-bit int
int oldval=(char)newbits[3];
// add the offset
int newval=oldval+offset;
// break it back apart to store in the string.
assert(newbits.length() == 4);
newbits[3]=(char)(newval>>0)&0xff;
// 3 most significant bytes extend the instruction
newbits+=(char)(newval>>8)&0xff;
newbits+=(char)(newval>>16)&0xff;
newbits+=(char)(newval>>24)&0xff;
}
else
newbits[3] += (char)offset;
}
else
assert(0);
break;
return newbits;
}
// opcode: 9A cp
// call ptr16:32, call far, absolute, address given in operand
case 0x9A:
/*
* convert_to_jump - assume newbits is a call insn, convert newbits to a jump, and return it.
* Also: if newbits is a call [esp+k], add "offset" to k.
*/
void convert_to_jump(Instruction_t* insn, int offset)
{
// convert to jmp ptr16:32
// opcode: EA cp
newbits[op_index+0]=0xEA;
break;
string newbits=insn->getDataBits();
auto dp=DecodedInstruction_t::factory(insn);
auto &d=*dp;
/* this case is odd, handle it specially (and more easily to understand) */
if(strcmp(d.getDisassembly().c_str(), "call qword [rsp]")==0)
{
char buf[100];
sprintf(buf,"jmp qword [rsp+%d]", offset);
insn->assemble(buf);
return;
}
/* skip over any prefixes */
int op_index=d.getPrefixCount(); // d.Prefix.Number;
// on the opcode. assume no prefix here
switch((unsigned char)newbits[op_index])
{
// opcodes: ff /2 and ff /3
case 0xff:
{
// opcode: ff /2
// call r/m32, call near, absolute indirect, address given in r/m32
if(((((unsigned char)newbits[op_index+1])&0x38)>>3) == 2)
{
newbits=adjust_esp_offset(newbits,offset);
// convert to jmp r/m32
// opcode: FF /4
newbits[op_index+1]&=0xC7; // remove old bits
newbits[op_index+1]|=(0x4<<3); // set r/m field to 4
}
// opcode: ff /3
// call m16:32, call far, absolute indirect, address given in m16:32
else if(((((unsigned char)newbits[op_index+1])&0x38)>>3) == 3)
{
// convert to jmp m16:32
// opcode: FF /5
newbits[op_index+1]&=0xC7; // remove old bits
newbits[op_index+1]|=(0x5<<3); // set r/m field to 5
}
else
assert(0);
break;
}
// opcode: 9A cp
// call ptr16:32, call far, absolute, address given in operand
case 0x9A:
{
// convert to jmp ptr16:32
// opcode: EA cp
newbits[op_index+0]=0xEA;
break;
}
// opcode: E8 cd
// call rel32, call near, relative, displacement relative to next insn.
case 0xE8:
{
// convert to jmp rel32
// opcode: E9 cd
newbits[op_index+0]=0xE9;
break;
}
// not a call
default:
assert(0);
}
/* set the instruction's bits */
insn->setDataBits(newbits);
return;
}
// opcode: E8 cd
// call rel32, call near, relative, displacement relative to next insn.
case 0xE8:
/*
* fix_call - convert call to push/jump.
*/
void fix_call(Instruction_t* insn, FileIR_t *firp, bool can_unpin)
{
// convert to jmp rel32
// opcode: E9 cd
newbits[op_index+0]=0xE9;
break;
}
// doesn't work for ARM64 yet.
if(firp->getArchitecture()->getMachineType()==admtAarch64)
return;
// not a call
default:
assert(0);
}
/* record the possibly new indirect branch target if this call gets fixed */
Instruction_t* newindirtarg=insn->getFallthrough();
/* set the instruction's bits */
insn->setDataBits(newbits);
return;
}
/* Disassemble the instruction */
auto disasmp=DecodedInstruction_t::factory (insn);
auto &disasm=*disasmp;
/* if this instruction is an inserted call instruction than we don't need to
* convert it for correctness' sake.
*/
if(insn->getAddress()->getVirtualOffset()==0)
return;
/* if the first byte isn't a call opcode, there's some odd prefixing and we aren't handling it.
* this comes up most frequently in a call gs:0x10 instruction where an override prefix specifes the gs: part.
*/
if((insn->getDataBits()[0]&0x40)==0x40)
{
// ignore rex prefixes
}
else if( (insn->getDataBits()[0]!=(char)0xff) &&
(insn->getDataBits()[0]!=(char)0xe8) &&
(insn->getDataBits()[0]!=(char)0x9a) )
{
cout<<"Found odd prefixing.\n Not handling **********************************************"<<endl;
assert(0);
return;
}
/*
* fix_call - convert call to push/jump.
*/
void fix_call(Instruction_t* insn, FileIR_t *firp, bool can_unpin)
{
if(firp->getArchitecture()->getMachineType()==admtAarch64)
return;
/* record the possibly new indirect branch target if this call gets fixed */
Instruction_t* newindirtarg=insn->getFallthrough();
/* Disassemble the instruction */
auto disasmp=DecodedInstruction_t::factory (insn);
auto &disasm=*disasmp;
/* if this instruction is an inserted call instruction than we don't need to
* convert it for correctness' sake.
*/
if(insn->getAddress()->getVirtualOffset()==0)
return;
/* if the first byte isn't a call opcode, there's some odd prefixing and we aren't handling it.
* this comes up most frequently in a call gs:0x10 instruction where an override prefix specifes the gs: part.
*/
if((insn->getDataBits()[0]&0x40)==0x40)
{
// ignore rex prefixes
}
else if( (insn->getDataBits()[0]!=(char)0xff) &&
(insn->getDataBits()[0]!=(char)0xe8) &&
(insn->getDataBits()[0]!=(char)0x9a) )
{
cout<<"Found odd prefixing.\n Not handling **********************************************"<<endl;
assert(0);
return;
}
if(getenv("VERBOSE_FIX_CALLS"))
{
cout<<"Doing a fix_call on "<<std::hex<<insn->getAddress()->getVirtualOffset()<< " which is "<<disasm.getDisassembly() /*.CompleteInstr*/<<endl;
}
VirtualOffset_t next_addr=insn->getAddress()->getVirtualOffset() + insn->getDataBits().length();
/* create a new instruction and a new addresss for it that do not correspond to any original program address */
auto callinsn=firp->addNewInstruction();
auto calladdr=firp->addNewAddress(insn->getAddress()->getFileID(),0);
/* set the fields in the new instruction */
callinsn->setAddress(calladdr);
callinsn->setTarget(insn->getTarget());
callinsn->setFallthrough(NULL);
callinsn->setFunction(insn->getFunction());
callinsn->setComment(insn->getComment()+" Jump part");
/* handle ib targets */
callinsn->setIBTargets(insn->getIBTargets());
insn->setIBTargets(NULL);
// We need the control transfer instruction to be from the orig program because
// if for some reason it's fallthrough/target isn't in the DB, we need to correctly
// emit fallthrough/target rules
callinsn->setOriginalAddressID(insn->getOriginalAddressID());
insn->setOriginalAddressID(BaseObj_t::NOT_IN_DATABASE);
/* set the new instruction's data bits to be a jmp instead of a call */
string newbits="";
/* add 4 (8) if it's an esp(rsp) indirect branch for x86-32 (-64) */
callinsn->setDataBits(insn->getDataBits());
convert_to_jump(callinsn,firp->getArchitectureBitWidth()/8);
/* the jump instruction should NOT be indirectly reachable. We should
* land at the push
*/
fix_other_pcrel(firp, callinsn, insn->getAddress()->getVirtualOffset());
callinsn->setIndirectBranchTargetAddress(NULL);
/* add the new insn and new address into the list of valid calls and addresses */
/* Convert the old call instruction into a push return_address instruction */
insn->setFallthrough(callinsn);
insn->setTarget(NULL);
newbits=string("");
newbits.resize(5);
newbits[0]=0x68; /* assemble an instruction push next_addr */
newbits[1]=(next_addr>>0) & 0xff;
newbits[2]=(next_addr>>8) & 0xff;
newbits[3]=(next_addr>>16) & 0xff;
newbits[4]=(next_addr>>24) & 0xff;
insn->setDataBits(newbits);
insn->setComment(insn->getComment()+" Push part");
/* create a relocation for this instruction */
auto reloc= firp->getArchitectureBitWidth()==32 ? firp->addNewRelocation(insn, 1, "32-bit") :
firp->getArchitectureBitWidth()==64 ? firp->addNewRelocation(insn, 0, "push64") :
throw invalid_argument("odd bit width?");
/* If the fallthrough is not marked as indirectly branchable-to, then mark it so */
if(newindirtarg && !newindirtarg->getIndirectBranchTargetAddress())
{
/* create a new address for the IBTA */
auto newaddr=firp->addNewAddress(newindirtarg->getAddress()->getFileID(), newindirtarg->getAddress()->getVirtualOffset());
/* set the instruction and include this address in the list of addrs */
newindirtarg->setIndirectBranchTargetAddress(newaddr);
// if we're marking this as an IBTA, determine whether we can unpin it or not
if(can_unpin)
{
if(getenv("VERBOSE_FIX_CALLS"))
{
cout<<"setting unpin for type="<< reloc->getType()<< " address="
<<hex<<insn->getBaseID()<<":"<<insn->getDisassembly()<<endl;
cout<<"Doing a fix_call on "<<hex<<insn->getAddress()->getVirtualOffset()<< " which is "<<disasm.getDisassembly() /*.CompleteInstr*/<<endl;
}
// set newindirtarg as unpinned
newindirtarg->getIndirectBranchTargetAddress()->setVirtualOffset(0);
reloc->setWRT(newindirtarg);
}
}
/* calculate the call's fallthrough addr with and without the file base */
const auto next_addr_with_fb = insn->getAddress()->getVirtualOffset() + insn->getDataBits().length();
const auto next_addr_no_fb = uint32_t(next_addr_with_fb - firp->getArchitecture()->getFileBase());
// mark in the IR what the fallthrough of this insn is.
auto fix_call_reloc=firp->addNewRelocation(callinsn, 0, "fix_call_fallthrough", newindirtarg);
(void)fix_call_reloc; // not used, just give to IR
}
/* create a new instruction and a new addresss for it that do not correspond to any original program address */
const auto callinsn = firp->addNewInstruction();
const auto calladdr = firp->addNewAddress(insn->getAddress()->getFileID(),0);
/* set the fields in the new instruction */
callinsn->setAddress(calladdr);
callinsn->setTarget(insn->getTarget());
callinsn->setFallthrough(NULL);
callinsn->setFunction(insn->getFunction());
callinsn->setComment(insn->getComment()+" Jump part");
//
// return true if insn is a call
//
bool is_call(Instruction_t* insn)
{
/* Disassemble the instruction */
auto disasm=DecodedInstruction_t::factory (insn);
return disasm->isCall();
}
/* handle ib targets */
callinsn->setIBTargets(insn->getIBTargets());
insn->setIBTargets(NULL);
bool can_skip_safe_function(Instruction_t *call_insn)
{
if (!call_insn)
return false;
if (!is_call(call_insn))
return false;
Instruction_t *target=call_insn->getTarget();
if (!target)
return false;
auto func=target->getFunction();
if (!func)
return false;
/* if the call instruction isn't to a function entry point */
if(func->getEntryPoint()!=target)
{
return false;
}
if (func->isSafe())
{
cout << "Function " << func->getName() << " is safe" << endl;
}
return func->isSafe();
}
// We need the control transfer instruction to be from the orig program because
// if for some reason it's fallthrough/target isn't in the DB, we need to correctly
// emit fallthrough/target rules
callinsn->setOriginalAddressID(insn->getOriginalAddressID());
insn->setOriginalAddressID(BaseObj_t::NOT_IN_DATABASE);
/* set the new instruction's data bits to be a jmp instead of a call */
string newbits="";
template <class T> struct insn_less : binary_function <T,T,bool>
{
bool operator() (const T& x, const T& y) const
{
return make_tuple(x->getBaseID(),x) < make_tuple(y->getBaseID(),y);
}
};
/* add 4 (8) if it's an esp(rsp) indirect branch for x86-32 (-64) */
callinsn->setDataBits(insn->getDataBits());
convert_to_jump(callinsn,firp->getArchitectureBitWidth()/8);
/* the jump instruction should NOT be indirectly reachable. We should
* land at the push
*/
fix_other_pcrel(firp, callinsn, insn->getAddress()->getVirtualOffset());
callinsn->setIndirectBranchTargetAddress(NULL);
//
// Mark ret_point as an unpinned IBT.
//
void mark_as_unpinned_ibt(FileIR_t* firp, Instruction_t* ret_point)
{
if( ret_point == NULL ) return;
if( ret_point->getIndirectBranchTargetAddress() != NULL ) return;
auto newaddr=firp->addNewAddress(ret_point->getAddress()->getFileID(),0);
ret_point->setIndirectBranchTargetAddress(newaddr);
}
/* add the new insn and new address into the list of valid calls and addresses */
//
// fix_all_calls - convert calls to push/jump pairs in the IR. if fix_all is true, all calls are converted,
// else we attempt to detect the calls it is safe to convert.
//
void fix_all_calls(FileIR_t* firp, bool fix_all)
{
auto sorted_insns = set<Instruction_t*,insn_less<Instruction_t*> >(ALLOF(firp->getInstructions()));
/* Convert the old call instruction into a push return_address instruction */
insn->setFallthrough(callinsn);
insn->setTarget(NULL);
newbits=string("");
newbits.resize(5);
newbits[0]=0x68; /* assemble an instruction push next_addr */
newbits[1]=(next_addr_no_fb>>0) & 0xff;
newbits[2]=(next_addr_no_fb>>8) & 0xff;
newbits[3]=(next_addr_no_fb>>16) & 0xff;
newbits[4]=(next_addr_no_fb>>24) & 0xff;
insn->setDataBits(newbits);
insn->setComment(insn->getComment()+" Push part");
for(auto insn : sorted_insns)
{
if(getenv("STOP_FIX_CALLS_AT") && fixed_calls>=(size_t)atoi(getenv("STOP_FIX_CALLS_AT")))
break;
/* create a relocation for this instruction */
auto reloc= firp->getArchitectureBitWidth()==32 ? firp->addNewRelocation(insn, 1, "32-bit") :
firp->getArchitectureBitWidth()==64 ? firp->addNewRelocation(insn, 0, "push64") :
throw invalid_argument("odd bit width?");
if(is_call(insn))
{
if( call_needs_fix(insn) ) // fixing is necessary + unpinning not possible.
{
fixed_calls++;
fix_call(insn, firp, false);
}
// we've been asked to fix all calls for funsies/cfi
// (and a bit about debugging fix-calls that's not important for anyone but jdh.
else if ( fix_all || (getenv("FIX_CALL_LIMIT") && not_fixed_calls>=(size_t)atoi(getenv("FIX_CALL_LIMIT"))))
/* If the fallthrough is not marked as indirectly branchable-to, then mark it so */
if(newindirtarg && !newindirtarg->getIndirectBranchTargetAddress())
{
auto fix_me = true;
if (!opt_fix_safefn && can_skip_safe_function(insn))
{
fix_me = false;
no_fix_for_safefn++;
}
/* create a new address for the IBTA */
auto newaddr=firp->addNewAddress(newindirtarg->getAddress()->getFileID(), newindirtarg->getAddress()->getVirtualOffset());
if(fix_me)
{
// if we make it here, we know that it was not 100% necessary to fix the call
// but we've been asked to anyhow.
fixed_calls++;
fix_call(insn, firp, true /* true here indicates that the call can have an unpin reloc -- anh to add option in 3 minutes */);
}
else
/* set the instruction and include this address in the list of addrs */
newindirtarg->setIndirectBranchTargetAddress(newaddr);
// if we're marking this as an IBTA, determine whether we can unpin it or not
if(can_unpin)
{
not_fixed_calls++;
if(getenv("VERBOSE_FIX_CALLS"))
{
cout<<"setting unpin for type="<< reloc->getType()<< " address="
<<hex<<insn->getBaseID()<<":"<<insn->getDisassembly()<<endl;
}
// set newindirtarg as unpinned
newindirtarg->getIndirectBranchTargetAddress()->setVirtualOffset(0);
reloc->setWRT(newindirtarg);
}
}
else
{
if(getenv("VERBOSE_FIX_CALLS"))
cout<<"No fix needed, marking ret site IBT, for "<<insn->getAddress()->getVirtualOffset()<<":"<<insn->getDisassembly()<<endl;
mark_as_unpinned_ibt(firp, insn->getFallthrough());
not_fixed_calls++;
}
}
else
{
if(getenv("VERBOSE_FIX_CALLS"))
cout<<"Not a call "<<insn->getAddress()->getVirtualOffset()<<":"<<insn->getDisassembly()<<endl;
not_calls++;
// mark in the IR what the fallthrough of this insn is and give the reloc to the IR.
(void)firp->addNewRelocation(callinsn, 0, "fix_call_fallthrough", newindirtarg);
}
}
cout << "# ATTRIBUTE fix_calls::fixed_calls="<<std::dec<<fixed_calls<<endl;
cout << "# ATTRIBUTE fix_calls::no_fix_needed_calls="<<std::dec<<not_fixed_calls<<endl;
cout << "# ATTRIBUTE fix_calls::other_instructions="<<std::dec<<not_calls<<endl;
cout << "# ATTRIBUTE fix_calls::fixed_pct="<<std::fixed<<(((float)fixed_calls)/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::remaining_ratio="<<std::fixed<<((float)not_fixed_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::other_insts_ratio="<<std::fixed<<((float)not_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::no_target_insn="<<std::dec<< no_target_insn << endl;
cout << "# ATTRIBUTE fix_calls::no_fallthrough_insn="<<std::dec<< no_fallthrough_insn << endl;
cout << "# ATTRIBUTE fix_calls::target_not_in_function="<<std::dec<< target_not_in_function << endl;
cout << "# ATTRIBUTE fix_calls::call_to_not_entry="<<std::dec<< call_to_not_entry << endl;
cout << "# ATTRIBUTE fix_calls::thunk_check="<<std::dec<< thunk_check << endl;
cout << "# ATTRIBUTE fix_calls::found_pattern="<<std::dec<< found_pattern << endl;
cout << "# ATTRIBUTE fix_calls::in_ehframe="<<std::dec<< in_ehframe << endl;
cout << "# ATTRIBUTE fix_calls::no_fix_for_ib="<<std::dec<< no_fix_for_ib << endl;
cout << "# ATTRIBUTE fix_calls::no_fix_for_safefn="<<std::dec<< no_fix_for_safefn << endl;
}
//
// fix_other_pcrel - add relocations to other instructions that have pcrel bits
//
void fix_other_pcrel(FileIR_t* firp, Instruction_t *insn, uintptr_t virt_offset)
{
auto disasm=DecodedInstruction_t::factory(insn);
const auto &operands=disasm->getOperands();
const auto relop_it=find_if(ALLOF(operands),[](const shared_ptr<DecodedOperand_t>& op)
{ return op->isPcrel() ; } );
const bool is_rel= relop_it!=operands.end();
/* if this has already been fixed, we can skip it */
if(virt_offset==0 || virt_offset==(uintptr_t)-1)
return;
if(is_rel)
{
const auto &the_arg=*(relop_it->get());
const auto mt=firp->getArchitecture()->getMachineType();
if(mt==admtAarch64)
//
// return true if insn is a call
//
bool is_call(Instruction_t* insn)
{
// figure out how to rewrite pcrel arm insns, then change the virt addr
// insn->getAddress()->setVirtualOffset(0);
/* Disassemble the instruction */
auto disasm=DecodedInstruction_t::factory (insn);
return disasm->isCall();
}
else if(mt==admtX86_64 || mt==admtI386)
bool can_skip_safe_function(Instruction_t *call_insn)
{
assert(the_arg.isMemory());
auto offset=disasm->getMemoryDisplacementOffset(&the_arg, insn);
assert(offset>=0 && offset <=15);
auto size=the_arg.getMemoryDisplacementEncodingSize();
assert(size==1 || size==2 || size==4 || size==8);
if (!call_insn)
return false;
if (!is_call(call_insn))
return false;
Instruction_t *target=call_insn->getTarget();
if (!target)
return false;
auto func=target->getFunction();
if (!func)
return false;
/* if the call instruction isn't to a function entry point */
if(func->getEntryPoint()!=target)
{
return false;
}
if(getenv("VERBOSE_FIX_CALLS"))
if (func->isSafe())
{
cout<<"Found insn with pcrel memory operand: "<<disasm->getDisassembly()
<<" Displacement="<<std::hex<<the_arg.getMemoryDisplacement() << dec
<<" size="<<the_arg.getMemoryDisplacementEncodingSize() <<" Offset="<<offset;
cout << "Function " << func->getName() << " is safe" << endl;
}
/* convert [rip_pc+displacement] addresssing mode into [rip_0+displacement] where rip_pc is the actual PC of the insn,
* and rip_0 is means that the PC=0. AKA, we are relocating this instruction to PC=0. Later we add a relocation to undo this transform at runtime
* when we know the actual address.
*/
return func->isSafe();
}
/* get the data */
string data=insn->getDataBits();
char cstr[20]={};
memcpy(cstr,data.c_str(), data.length());
void *offsetptr=&cstr[offset];
auto disp=the_arg.getMemoryDisplacement();
auto oldpc=virt_offset;
auto newdisp=disp+oldpc-firp->getArchitecture()->getFileBase();
template <class T> struct insn_less : binary_function <T,T,bool>
{
bool operator() (const T& x, const T& y) const
{
return make_tuple(x->getBaseID(),x) < make_tuple(y->getBaseID(),y);
}
};
assert((uintptr_t)(offset+size)<=(uintptr_t)(data.length()));
//
// Mark ret_point as an unpinned IBT.
//
void mark_as_unpinned_ibt(FileIR_t* firp, Instruction_t* ret_point)
{
if( ret_point == NULL ) return;
if( ret_point->getIndirectBranchTargetAddress() != NULL ) return;
switch(size)
auto newaddr=firp->addNewAddress(ret_point->getAddress()->getFileID(),0);
ret_point->setIndirectBranchTargetAddress(newaddr);
}
//
// fix_all_calls - convert calls to push/jump pairs in the IR. if fix_all is true, all calls are converted,
// else we attempt to detect the calls it is safe to convert.
//
void fix_all_calls(FileIR_t* firp, bool fix_all)
{
const auto sorted_insns = set<Instruction_t*,insn_less<Instruction_t*> >(ALLOF(firp->getInstructions()));
const auto fcl = getenv("FIX_CALL_LIMIT");
const auto sfca = getenv("STOP_FIX_CALLS_AT");
for(auto insn : sorted_insns)
{
case 4:
assert( (uintptr_t)(int)newdisp == (uintptr_t)newdisp);
*(int*)offsetptr=newdisp;
if(getenv("STOP_FIX_CALLS_AT") && fixed_calls>=(size_t)atoi(
sfca
))
break;
case 1:
case 2:
case 8:
default:
assert(0);
//assert(("Cannot handle offset of given size", 0));
if(is_call(insn))
{
if( call_needs_fix(insn) ) // fixing is necessary + unpinning not possible.
{
fixed_calls++;
fix_call(insn, firp, false);
}
// we've been asked to fix all calls for funsies/cfi
// (and a bit about debugging fix-calls that's not important for anyone but jdh.
else if ( fix_all || (fcl && not_fixed_calls>=(size_t)atoi(fcl)))
{
auto fix_me = true;
if (!opt_fix_safefn && can_skip_safe_function(insn))
{
fix_me = false;
no_fix_for_safefn++;
}
if(fix_me)
{
// if we make it here, we know that it was not 100% necessary to fix the call
// but we've been asked to anyhow.
fixed_calls++;
fix_call(insn, firp, pin_fixed);
}
else
{
not_fixed_calls++;
}
}
else
{
if(getenv("VERBOSE_FIX_CALLS"))
cout<<"No fix needed, marking ret site IBT, for "<<insn->getAddress()->getVirtualOffset()<<":"<<insn->getDisassembly()<<endl;
mark_as_unpinned_ibt(firp, insn->getFallthrough());
not_fixed_calls++;
}
}
else
{
if(getenv("VERBOSE_FIX_CALLS"))
cout<<"Not a call "<<insn->getAddress()->getVirtualOffset()<<":"<<insn->getDisassembly()<<endl;
not_calls++;
}
}
/* put the data back into the insn */
data.replace(0, data.length(), cstr, data.length());
insn->setDataBits(data);
cout << "# ATTRIBUTE fix_calls::fixed_calls="<<dec<<fixed_calls<<endl;
cout << "# ATTRIBUTE fix_calls::no_fix_needed_calls="<<dec<<not_fixed_calls<<endl;
cout << "# ATTRIBUTE fix_calls::other_instructions="<<dec<<not_calls<<endl;
cout << "# ATTRIBUTE fix_calls::fixed_pct="<<fixed<<(((float)fixed_calls)/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::remaining_ratio="<<fixed<<((float)not_fixed_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::other_insts_ratio="<<fixed<<((float)not_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl;
cout << "# ATTRIBUTE fix_calls::no_target_insn="<<dec<< no_target_insn << endl;
cout << "# ATTRIBUTE fix_calls::no_fallthrough_insn="<<dec<< no_fallthrough_insn << endl;
cout << "# ATTRIBUTE fix_calls::target_not_in_function="<<dec<< target_not_in_function << endl;
cout << "# ATTRIBUTE fix_calls::call_to_not_entry="<<dec<< call_to_not_entry << endl;
cout << "# ATTRIBUTE fix_calls::thunk_check="<<dec<< thunk_check << endl;
cout << "# ATTRIBUTE fix_calls::found_pattern="<<dec<< found_pattern << endl;
cout << "# ATTRIBUTE fix_calls::in_ehframe="<<dec<< in_ehframe << endl;
cout << "# ATTRIBUTE fix_calls::no_fix_for_ib="<<dec<< no_fix_for_ib << endl;
cout << "# ATTRIBUTE fix_calls::no_fix_for_safefn="<<dec<< no_fix_for_safefn << endl;
}
other_fixes++;
disasm=DecodedInstruction_t::factory(insn);
if(getenv("VERBOSE_FIX_CALLS"))
cout<<" Converted to: "<<disasm->getDisassembly() << endl;
//
// fix_other_pcrel - add relocations to other instructions that have pcrel bits
//
void fix_other_pcrel(FileIR_t* firp, Instruction_t *insn, uintptr_t virt_offset)
{
auto disasm=DecodedInstruction_t::factory(insn);
const auto &operands=disasm->getOperands();
const auto relop_it=find_if(ALLOF(operands),[](const shared_ptr<DecodedOperand_t>& op)
{ return op->isPcrel() ; } );
const bool is_rel= relop_it!=operands.end();
/* if this has already been fixed, we can skip it */
if(virt_offset==0 || virt_offset==(uintptr_t)-1)
return;
if(is_rel)
{
const auto &the_arg=*(relop_it->get());
const auto mt=firp->getArchitecture()->getMachineType();
if(mt==admtAarch64)
{
// figure out how to rewrite pcrel arm insns, then change the virt addr
// insn->getAddress()->setVirtualOffset(0);
}
else if(mt==admtX86_64 || mt==admtI386)
{
assert(the_arg.isMemory());
auto offset=disasm->getMemoryDisplacementOffset(&the_arg, insn);
assert(offset>=0 && offset <=15);
auto size=the_arg.getMemoryDisplacementEncodingSize();
assert(size==1 || size==2 || size==4 || size==8);
if(getenv("VERBOSE_FIX_CALLS"))
{
cout<<"Found insn with pcrel memory operand: "<<disasm->getDisassembly()
<<" Displacement="<<hex<<the_arg.getMemoryDisplacement() << dec
<<" size="<<the_arg.getMemoryDisplacementEncodingSize() <<" Offset="<<offset;
}
/* convert [rip_pc+displacement] addresssing mode into [rip_0+displacement] where rip_pc is the actual PC of the insn,
* and rip_0 is means that the PC=0. AKA, we are relocating this instruction to PC=0. Later we add a relocation to undo this transform at runtime
* when we know the actual address.
*/
/* get the data */
string data=insn->getDataBits();
char cstr[20]={};
memcpy(cstr,data.c_str(), data.length());
void *offsetptr=&cstr[offset];
auto disp=the_arg.getMemoryDisplacement();
auto oldpc=virt_offset;
auto newdisp=disp+oldpc-firp->getArchitecture()->getFileBase();
assert((uintptr_t)(offset+size)<=(uintptr_t)(data.length()));
switch(size)
{
case 4:
assert( (uintptr_t)(int)newdisp == (uintptr_t)newdisp);
*(int*)offsetptr=newdisp;
break;
case 1:
case 2:
case 8:
default:
assert(0);
//assert(("Cannot handle offset of given size", 0));
}
/* put the data back into the insn */
data.replace(0, data.length(), cstr, data.length());
insn->setDataBits(data);
other_fixes++;
disasm=DecodedInstruction_t::factory(insn);
if(getenv("VERBOSE_FIX_CALLS"))
cout<<" Converted to: "<<disasm->getDisassembly() << endl;
// and it's important to set the VO to 0, so that the pcrel-ness is calculated correctly.
insn->getAddress()->setVirtualOffset(0);
}
// and it's important to set the VO to 0, so that the pcrel-ness is calculated correctly.
insn->getAddress()->setVirtualOffset(0);
// now that we've done the rewriting, go ahead and add the reloc.
auto reloc=firp->addNewRelocation(insn,0,"pcrel");
(void)reloc; // not used, only given to the IR
}
}
// now that we've done the rewriting, go ahead and add the reloc.
auto reloc=firp->addNewRelocation(insn,0,"pcrel");
(void)reloc; // not used, only given to the IR
void fix_safefr(FileIR_t* firp, Instruction_t *insn, uintptr_t virt_offset)
{
/* if this has already been fixed, we can skip it */
if(virt_offset==0 || virt_offset==(uintptr_t)-1)
return;
}
}
for(auto reloc : insn->getRelocations())
{
assert(reloc);
if( reloc->getType() == "safefr" )
{
auto addr=firp->addNewAddress(insn->getAddress()->getFileID(), 0);
insn->setAddress(addr);
}
}
}
void fix_safefr(FileIR_t* firp, Instruction_t *insn, uintptr_t virt_offset)
{
/* if this has already been fixed, we can skip it */
if(virt_offset==0 || virt_offset==(uintptr_t)-1)
return;
for(auto reloc : insn->getRelocations())
{
assert(reloc);
if( reloc->getType() == "safefr" )
void fix_other_pcrel(FileIR_t* firp)
{
auto addr=firp->addNewAddress(insn->getAddress()->getFileID(), 0);
insn->setAddress(addr);
for(auto insn : firp->getInstructions())
{
fix_other_pcrel(firp,insn, insn->getAddress()->getVirtualOffset());
fix_safefr(firp,insn, insn->getAddress()->getVirtualOffset());
}
cout << "# ATTRIBUTE fix_calls::other_fixes="<<dec<<other_fixes<<endl;
}
}
}
//
// main rountine; convert calls into push/jump statements
//
// int main(int argc, char* argv[])
void fix_other_pcrel(FileIR_t* firp)
{
for(auto insn : firp->getInstructions())
{
fix_other_pcrel(firp,insn, insn->getAddress()->getVirtualOffset());
fix_safefr(firp,insn, insn->getAddress()->getVirtualOffset());
}
cout << "# ATTRIBUTE fix_calls::other_fixes="<<std::dec<<other_fixes<<endl;
}
//
// main rountine; convert calls into push/jump statements
//
// int main(int argc, char* argv[])
bool fix_all=false;
bool pin_fixed=false;
bool do_eh_frame=true;
DatabaseID_t variant_id=BaseObj_t::NOT_IN_DATABASE;
bool fix_all=false;
bool do_eh_frame=true;
public:
int parseArgs(const vector<string> step_args)
{
int parseArgs(const vector<string> step_args)
{
for(auto argc_iter=0u; argc_iter<step_args.size(); argc_iter++)
{
if("--pin-fixed"==step_args[argc_iter])
{
pin_fixed=true;
#if 0
if(step_args.size()<1)
{
cerr<<"Usage: <id> [--fix-all | --no-fix-all ] [--eh-frame | --no-ehframe] "<<endl;
cerr<<" --eh-frame " << endl;
cerr<<" --no-eh-frame Use (or dont) the eh-frame section to be compatible with exception handling." << endl;
cerr<<" --fix-all " << endl;
cerr<<" --no-fix-all Convert (or don't) all calls to push/jmp pairs."<<endl;
cerr<<" --fix-icalls Convert (or don't) indirect calls."<<endl;
cerr<<" --no-fix-icalls Convert (or don't) indirect calls."<<endl;
exit(-1);
}
#endif
for(auto argc_iter=0u; argc_iter<step_args.size(); argc_iter++)
{
if("--fix-all"==step_args[argc_iter])
{
fix_all=true;
}
else if("--no-fix-all"==step_args[argc_iter])
{
fix_all=false;
}
else if("--eh-frame"==step_args[argc_iter])
{
do_eh_frame=true;
}
else if("--no-eh-frame"==step_args[argc_iter])
{
do_eh_frame=false;
}
else if("--fix-icalls"==step_args[argc_iter])
{
opt_fix_icalls = true;
}
else if("--no-fix-icalls"==step_args[argc_iter])
{
opt_fix_icalls = false;
}
else if("--fix-safefn"==step_args[argc_iter])
{
opt_fix_safefn = true;
}
else if("--no-fix-safefn"==step_args[argc_iter])
{
opt_fix_safefn = false;
}
else if("--no-pin-fixed"==step_args[argc_iter])
{
pin_fixed=false;
}
else if("--fix-all"==step_args[argc_iter])
{
fix_all=true;
}
else if("--no-fix-all"==step_args[argc_iter])
{
fix_all=false;
}
else if("--eh-frame"==step_args[argc_iter])
{
do_eh_frame=true;
}
else if("--no-eh-frame"==step_args[argc_iter])
{
do_eh_frame=false;
}
else if("--fix-icalls"==step_args[argc_iter])
{
opt_fix_icalls = true;
}
else if("--no-fix-icalls"==step_args[argc_iter])
{
opt_fix_icalls = false;
}
else if("--fix-safefn"==step_args[argc_iter])
{
opt_fix_safefn = true;
}
else if("--no-fix-safefn"==step_args[argc_iter])
{
opt_fix_safefn = false;
}
else
{
cerr<<"Unrecognized option: "<<step_args[argc_iter]<<endl;
return -1;
}
}
if(getenv("FIX_CALLS_FIX_ALL_CALLS"))
fix_all=true;
return 0;
}
else
int executeStep()
{
cerr<<"Unrecognized option: "<<step_args[argc_iter]<<endl;
return -1;
}
}
if(getenv("FIX_CALLS_FIX_ALL_CALLS"))
fix_all=true;
variant_id=getVariantID();
auto irdb_objects=getIRDBObjects();
return 0;
}
cout<<"Reading variant "<<variant_id<<" from database." << endl;
try
{
/* setup the interface to the sql server */
const auto pqxx_interface=irdb_objects->getDBInterface();
BaseObj_t::setInterface(pqxx_interface);
DatabaseID_t variant_id=BaseObj_t::NOT_IN_DATABASE;
auto pidp = irdb_objects->addVariant(variant_id);
cout<<"Fixing calls->push/jmp in variant "<<*pidp<< "." <<endl;
assert(pidp->isRegistered()==true);
int executeStep()
{
variant_id=getVariantID();
auto irdb_objects=getIRDBObjects();
cout<<"Reading variant "<<variant_id<<" from database." << endl;
try
{
/* setup the interface to the sql server */
const auto pqxx_interface=irdb_objects->getDBInterface();
BaseObj_t::setInterface(pqxx_interface);
auto pidp = irdb_objects->addVariant(variant_id);
cout<<"Fixing calls->push/jmp in variant "<<*pidp<< "." <<endl;
assert(pidp->isRegistered()==true);
for(const auto &this_file : pidp->getFiles())
{
assert(this_file);
// read the db
auto firp = irdb_objects->addFileIR(variant_id, this_file->getBaseID());
assert(firp && pidp);
eh_frame_ranges.clear();
int elfoid=firp->getFile()->getELFOID();
pqxx::largeobject lo(elfoid);
lo.to_file(pqxx_interface->getTransaction(),"readeh_tmp_file.exe");
EXEIO::exeio* elfiop=new EXEIO::exeio;
elfiop->load(string("readeh_tmp_file.exe"));
EXEIO::dump::header(cout,*elfiop);
EXEIO::dump::section_headers(cout,*elfiop);
// do eh_frame reading as required.
if(do_eh_frame)
read_ehframe(firp, elfiop);
setFrameSizes(firp);
fix_all_calls(firp,fix_all);
fix_other_pcrel(firp);
cout<<"Done!"<<endl;
if(firp->getArchitecture()->getMachineType() != admtAarch64)
assert(getenv("SELF_VALIDATE")==nullptr || (fixed_calls + other_fixes) > 5);
for(const auto &this_file : pidp->getFiles())
{
assert(this_file);
// read the db
auto firp = irdb_objects->addFileIR(variant_id, this_file->getBaseID());
assert(firp && pidp);
eh_frame_ranges.clear();
int elfoid=firp->getFile()->getELFOID();
pqxx::largeobject lo(elfoid);
lo.to_file(pqxx_interface->getTransaction(),"readeh_tmp_file.exe");
EXEIO::exeio* elfiop=new EXEIO::exeio;
elfiop->load(string("readeh_tmp_file.exe"));
EXEIO::dump::header(cout,*elfiop);
EXEIO::dump::section_headers(cout,*elfiop);
// do eh_frame reading as required.
if(do_eh_frame)
read_ehframe(firp, elfiop);
setFrameSizes(firp);
}
}
catch (DatabaseError_t pnide)
{
cout<<"Unexpected database error: "<<pnide<<endl;
return -1;
}
catch(...)
{
cerr<<"Unexpected error"<<endl;
return -1;
}
assert(getenv("SELF_VALIDATE")==nullptr || fix_all || not_fixed_calls > 5);
return 0;
}
fix_all_calls(firp,fix_all);
fix_other_pcrel(firp);
void range(VirtualOffset_t a, VirtualOffset_t b)
{
// we've found examples of ranges being 0 sized, and it's a bit weird what that means.
// it applies to 0 instructions?
// skip it, it's likely an invalid FDE.
if(a==b)
return;
// non-zero sized fde
assert(a<b);
const auto rangeiter=eh_frame_ranges.find(Range_t(a+1,a+1));
assert(rangeiter==eh_frame_ranges.end());
eh_frame_ranges.insert(Range_t(a+1,b)); // ranges are interpreted as (a,b]
}
cout<<"Done!"<<endl;
bool possible_target(uintptr_t p, uintptr_t at, ibt_provenance_t prov)
{
// used for LDSA
return false;
}
if(firp->getArchitecture()->getMachineType() != admtAarch64)
assert(getenv("SELF_VALIDATE")==nullptr || (fixed_calls + other_fixes) > 5);
string getStepName(void) const override
{
return std::string("fix_calls");
}
}
}
catch (DatabaseError_t pnide)
{
cout<<"Unexpected database error: "<<pnide<<endl;
return -1;
}
catch(...)
{
cerr<<"Unexpected error"<<endl;
return -1;
}
void setFrameSizes(FileIR_t* firp)
{
for(auto func : firp->getFunctions())
{
if(func->getEntryPoint()==nullptr) continue;
assert(getenv("SELF_VALIDATE")==nullptr || fix_all || not_fixed_calls > 5);
return 0;
}
void range(VirtualOffset_t a, VirtualOffset_t b)
{
// we've found examples of ranges being 0 sized, and it's a bit weird what that means.
// it applies to 0 instructions?
// skip it, it's likely an invalid FDE.
if(a==b)
return;
// non-zero sized fde
assert(a<b);
const auto rangeiter=eh_frame_ranges.find(Range_t(a+1,a+1));
assert(rangeiter==eh_frame_ranges.end());
eh_frame_ranges.insert(Range_t(a+1,b)); // ranges are interpreted as (a,b]
}
bool possible_target(uintptr_t p, uintptr_t at, ibt_provenance_t prov)
{
// used for LDSA
return false;
}
const auto is_found_it=cfg_optimizer.find(func);
const auto is_found=(is_found_it!=end(cfg_optimizer));
if(!is_found)
/* build a cfg for this function */
cfg_optimizer[func]=shared_ptr<ControlFlowGraph_t>(move(ControlFlowGraph_t::factory(func)));
string getStepName(void) const override
{
return string("fix_calls");
}
const auto cfg=cfg_optimizer[func].get();
const auto entry_block=cfg->getEntry();
auto pushes=0;
for(auto insn : entry_block->getInstructions())
private:
void setFrameSizes(FileIR_t* firp)
{
const auto di=DecodedInstruction_t::factory(insn);
const auto mnemonic=di->getMnemonic();
if(mnemonic=="push")
pushes++;
if(mnemonic=="sub")
for(auto func : firp->getFunctions())
{
const auto hasop0 = di->hasOperand(0);
const auto op0_sp = hasop0 && (di->getOperand(0)->getString()=="rsp" || di->getOperand(0)->getString()=="esp");
const auto hasop1 = di->hasOperand(1);
const auto op1_const = hasop1 && di->getOperand(1)->isConstant();
if(op0_sp && op1_const)
if(func->getEntryPoint()==nullptr) continue;
const auto is_found_it=cfg_optimizer.find(func);
const auto is_found=(is_found_it!=end(cfg_optimizer));
if(!is_found)
/* build a cfg for this function */
cfg_optimizer[func]=shared_ptr<ControlFlowGraph_t>(move(ControlFlowGraph_t::factory(func)));
const auto cfg=cfg_optimizer[func].get();
const auto entry_block=cfg->getEntry();
auto pushes=0;
for(auto insn : entry_block->getInstructions())
{
func->setStackFrameSize(di->getOperand(1)->getConstant());
const auto di=DecodedInstruction_t::factory(insn);
const auto mnemonic=di->getMnemonic();
if(mnemonic=="push")
pushes++;
if(mnemonic=="sub")
{
const auto hasop0 = di->hasOperand(0);
const auto op0_sp = hasop0 && (di->getOperand(0)->getString()=="rsp" || di->getOperand(0)->getString()=="esp");
const auto hasop1 = di->hasOperand(1);
const auto op1_const = hasop1 && di->getOperand(1)->isConstant();
if(op0_sp && op1_const)
{
func->setStackFrameSize(di->getOperand(1)->getConstant());
}
break;
}
}
break;
}
}
}
}
}; // end class FixCalls_t
......
zipr_push64_reloc_plugin @ 0028dc0f
Compare add98bda...0028dc0f
Subproject commit add98bda82ff3f815dc72c2f50c46f69fa93caf3
Subproject commit 0028dc0fb2b02db2cf7423074464b7eb4278aa0f
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment