T0b1/test-repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disallow LOCK prefix for non-lockable instructions

Browse Source
This commit is contained in:
Alexis Engelke
2019-02-24 09:26:23 +01:00
parent 89d6b5a5a7
commit b2b29239b1
3 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
decode.c
View File

@@ -297,10 +297,11 @@ struct InstrDesc
uint8_t operand_sizes;
uint8_t immediate;
uint32_t gp_size_8 : 1;
uint32_t gp_size_def64 : 1;
uint32_t gp_instr_width : 1;
uint32_t gp_fixed_operand_size : 3;
uint8_t gp_size_8 : 1;
uint8_t gp_size_def64 : 1;
uint8_t gp_instr_width : 1;
uint8_t gp_fixed_operand_size : 3;
uint8_t lock : 1;
} __attribute__((packed));
#define DESC_HAS_MODRM(desc) (((desc)->operand_indices & (3 << 0)) != 0)
@@ -616,6 +617,11 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
}
}
if ((prefixes & PREFIX_LOCK) && !desc->lock)
return -1;
if ((prefixes & PREFIX_LOCK) && instr->operands[0].type != FD_OT_MEM)
return -1;
instr->size = off;
return off;