From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jan 2024 17:07:59 +0000 (-0800)
Subject: Merge tag 'probes-fixes-v6.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.7~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7131c2e9bba7aef8669fc8b21a52de5cf134b010;p=linux-block.git

Merge tag 'probes-fixes-v6.7-rc8' of git://git./linux/kernel/git/trace/linux-trace

Pull kprobes/x86 fix from Masami Hiramatsu:

 - Fix to emulate indirect call which size is not 5 byte.

   Current code expects the indirect call instructions are 5 bytes, but
   that is incorrect. Usually indirect call based on register is shorter
   than that, thus the emulation causes a kernel crash by accessing
   wrong instruction boundary. This uses the instruction size to
   calculate the return address correctly.

* tag 'probes-fixes-v6.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  x86/kprobes: fix incorrect return address calculation in kprobe_emulate_call_indirect
---

7131c2e9bba7aef8669fc8b21a52de5cf134b010