T0b1/fadec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reject invalid VEX encodings

Browse Source
This commit is contained in:
Alexis Engelke
2019-11-02 21:08:34 +01:00
parent bd6c7ceebe
commit e2026b572d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
decode.c
View File

@@ -389,7 +389,12 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
prefixes &= ~(PREFIX_OPSZ | PREFIX_REPNZ | PREFIX_REP); prefixes &= ~(PREFIX_OPSZ | PREFIX_REPNZ | PREFIX_REP);
ENTRY_UNPACK(table, kind, table[index]); ENTRY_UNPACK(table, kind, table[index]);
} }
else if (kind == ENTRY_TABLE_PREFIX_REP) else if (prefixes & PREFIX_VEX)
{
return -1;
}
if (kind == ENTRY_TABLE_PREFIX_REP)
{ {
// Discard 66h mandatory prefix // Discard 66h mandatory prefix
uint8_t index = mandatory_prefix != 1 ? mandatory_prefix : 0; uint8_t index = mandatory_prefix != 1 ? mandatory_prefix : 0;
@@ -491,6 +496,10 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
operand->type = FD_OT_REG; operand->type = FD_OT_REG;
operand->reg = vex_operand; operand->reg = vex_operand;
} }
else if (vex_operand != 0)
{
return -1;
}
uint32_t imm_control = DESC_IMM_CONTROL(desc); uint32_t imm_control = DESC_IMM_CONTROL(desc);
if (imm_control == 1) if (imm_control == 1)