Skip to content

x86/insn: Fix not using prefixes.nbytes for loop over prefixes.bytes

Masami Hiramatsu lkml 3 versions – In review

Get series with b4
b4 am 160707930875.3296595.12884856538916078988.stgit@devnote2

Versions newest first · linked by author and title

  1. v3 Latest3 patches 5 repliesIn review
  2. v23 patches 22 repliesApplied
  3. v13 patches 7 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3x86/uprobes: Fix not using prefixes.nbytes for loop over prefixes.bytesarch/x86/include/asm/insn.h arch/x86/kernel/uprobes.c arch/x86/lib/insn.c +2 more+104 -83 replies
2/3x86/insn-eval: Fix not using prefixes.nbytes for loop over prefixes.bytesarch/x86/lib/insn-eval.c+5 -50 replies
3/3x86/sev-es: Fix not using prefixes.nbytes for loop over prefixes.bytesarch/x86/boot/compressed/sev-es.c+2 -30 replies

Reviews trailers per patch

1 of 3 patches has a Reviewed-by or Acked-by.

PatchKees CookSrikar Dronamraju
1/3Debugged-by R-b
2/3Debugged-by
3/3Debugged-by

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/3] x86/insn: Fix not using prefixes.nbytes for loop over prefixes.bytes

Hi,

Here are the 3rd version of patches to fix the wrong loop boundary check on insn.prefixes.bytes[] array.

The previous version is here;

https://lkml.kernel.org/r/160697102582.3146288.10127018634865687932.stgit@devnote2

In this version, I've fixed some comments, added NUM_INSN_FIELD_BYTES and MAX_LEGACY_PREFIX_GROUPS macros and commented on it.

Kees Cook got a syzbot warning and found this issue and there were similar wrong boundary check patterns in the x86 code.

Since the insn.prefixes.nbytes can be bigger than the size of insn.prefixes.bytes[] when a same prefix is repeated, we have to check whether the insn.prefixes.bytes[i] != 0 (*) and i < 4 instead of insn.prefixes.nbytes.

(*) Note that insn.prefixes.bytes[] should be zeroed in insn_init() before decoding, and 0x00 is not a legacy prefix. So if you see 0 on insn.prefix.bytes[], it indicates the end of the array. Or, if the prefixes.bytes[] is filled with prefix bytes, we can check the index is less than 4.

Thank you,

---

Masami Hiramatsu (3):
x86/uprobes: Fix not using prefixes.nbytes for loop over prefixes.bytes x86/insn-eval: Fix not using prefixes.nbytes for loop over prefixes.bytes x86/sev-es: Fix not using prefixes.nbytes for loop over prefixes.bytes

 arch/x86/boot/compressed/sev-es.c |    5 ++--
 arch/x86/include/asm/insn.h       |   49 ++++++++++++++++++++++++++++++++++++-
 arch/x86/kernel/uprobes.c         |   10 +++++---
 arch/x86/lib/insn-eval.c          |   10 ++++----
 arch/x86/lib/insn.c               |    2 +-
 tools/arch/x86/include/asm/insn.h |   49 ++++++++++++++++++++++++++++++++++++-
 tools/arch/x86/lib/insn.c         |    2 +-
 7 files changed, 111 insertions(+), 16 deletions(-)
Signature · 1 line
Masami Hiramatsu (Linaro) <[email protected]>