Skip to content

Commit 377fb3d

Browse files
oleg-nesterovgregkh
authored andcommitted
uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
commit 90718e3 upstream. insn_get_length() has the side-effect of processing the entire instruction but only if it was decoded successfully, otherwise insn_complete() can fail and in this case we need to just return an error without warning. Reported-by: syzbot+30d675e3ca03c1c351e7@syzkaller.appspotmail.com Signed-off-by: Oleg Nesterov <oleg@redhat.com> Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: syzkaller-bugs@googlegroups.com Link: https://lkml.kernel.org/lkml/20180518162739.GA5559@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 062c496 commit 377fb3d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/uprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
290290
insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);
291291
/* has the side-effect of processing the entire instruction */
292292
insn_get_length(insn);
293-
if (WARN_ON_ONCE(!insn_complete(insn)))
293+
if (!insn_complete(insn))
294294
return -ENOEXEC;
295295

296296
if (is_prefix_bad(insn))

0 commit comments

Comments
 (0)