Skip to content

Commit 4924f0f

Browse files
committed
kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address
jira LE-1907 cve CVE-2024-26946 Rebuild_History Non-Buildable kernel-5.14.0-427.35.1.el9_4 commit-author Masami Hiramatsu (Google) <mhiramat@kernel.org> commit 4e51653 Read from an unsafe address with copy_from_kernel_nofault() in arch_adjust_kprobe_addr() because this function is used before checking the address is in text or not. Syzcaller bot found a bug and reported the case if user specifies inaccessible data area, arch_adjust_kprobe_addr() will cause a kernel panic. [ mingo: Clarified the comment. ] Fixes: cc66bb9 ("x86/ibt,kprobes: Cure sym+0 equals fentry woes") Reported-by: Qiang Zhang <zzqq0103.hey@gmail.com> Tested-by: Jinghao Jia <jinghao7@illinois.edu> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/171042945004.154897.2221804961882915806.stgit@devnote2 (cherry picked from commit 4e51653) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 4d6cb25 commit 4924f0f

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

arch/x86/kernel/kprobes/core.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,16 @@ static int can_probe(unsigned long paddr)
303303
kprobe_opcode_t *arch_adjust_kprobe_addr(unsigned long addr, unsigned long offset,
304304
bool *on_func_entry)
305305
{
306-
if (is_endbr(*(u32 *)addr)) {
306+
u32 insn;
307+
308+
/*
309+
* Since 'addr' is not guaranteed to be safe to access, use
310+
* copy_from_kernel_nofault() to read the instruction:
311+
*/
312+
if (copy_from_kernel_nofault(&insn, (void *)addr, sizeof(u32)))
313+
return NULL;
314+
315+
if (is_endbr(insn)) {
307316
*on_func_entry = !offset || offset == 4;
308317
if (*on_func_entry)
309318
offset = 4;

0 commit comments

Comments
 (0)