Commit 84da009f authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Borislav Petkov

x86/sev-es: Use new for_each_insn_prefix() macro to loop over prefixes bytes

Since insn.prefixes.nbytes can be bigger than the size of
insn.prefixes.bytes[] when a prefix is repeated, the proper
check must be:

  insn.prefixes.bytes[i] != 0 and i < 4

instead of using insn.prefixes.nbytes. Use the new
for_each_insn_prefix() macro which does it correctly.

Debugged by Kees Cook <keescook@chromium.org>.

 [ bp: Massage commit message. ]

Fixes: 25189d08 ("x86/sev-es: Add support for handling IOIO exceptions")
Reported-by: syzbot+9b64b619f10f19d19a7c@syzkaller.appspotmail.com
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/160697106089.3146288.2052422845039649176.stgit@devnote2
parent 12cb908a
...@@ -32,13 +32,12 @@ struct ghcb *boot_ghcb; ...@@ -32,13 +32,12 @@ struct ghcb *boot_ghcb;
*/ */
static bool insn_has_rep_prefix(struct insn *insn) static bool insn_has_rep_prefix(struct insn *insn)
{ {
insn_byte_t p;
int i; int i;
insn_get_prefixes(insn); insn_get_prefixes(insn);
for (i = 0; i < insn->prefixes.nbytes; i++) { for_each_insn_prefix(insn, i, p) {
insn_byte_t p = insn->prefixes.bytes[i];
if (p == 0xf2 || p == 0xf3) if (p == 0xf2 || p == 0xf3)
return true; return true;
} }
......
Markdown is supported
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