This is a note to let you know that I've just added the patch titled x86/unwind/orc: Fix error path for bad ORC entry type to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-unwind-orc-fix-error-path-for-bad-orc-entry-type.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a0f81bf26888048100bf017fadf438a5bdffa8d8 Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Date: Sat, 25 Apr 2020 05:06:13 -0500 Subject: x86/unwind/orc: Fix error path for bad ORC entry type From: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> commit a0f81bf26888048100bf017fadf438a5bdffa8d8 upstream. If the ORC entry type is unknown, nothing else can be done other than reporting an error. Exit the function instead of breaking out of the switch statement. Fixes: ee9f8fce9964 ("x86/unwind: Add the ORC unwinder") Reviewed-by: Miroslav Benes <mbenes@xxxxxxx> Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Andy Lutomirski <luto@xxxxxxxxxx> Cc: Dave Jones <dsj@xxxxxx> Cc: Jann Horn <jannh@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Vince Weaver <vincent.weaver@xxxxxxxxx> Link: https://lore.kernel.org/r/a7fa668ca6eabbe81ab18b2424f15adbbfdc810a.1587808742.git.jpoimboe@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/unwind_orc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/unwind_orc.c +++ b/arch/x86/kernel/unwind_orc.c @@ -528,7 +528,7 @@ bool unwind_next_frame(struct unwind_sta default: orc_warn("unknown .orc_unwind entry type %d for ip %pB\n", orc->type, (void *)orig_ip); - break; + goto err; } /* Find BP: */ Patches currently in stable-queue which might be from jpoimboe@xxxxxxxxxx are queue-5.4/x86-entry-64-fix-unwind-hints-in-kernel-exit-path.patch queue-5.4/x86-unwind-orc-don-t-skip-the-first-frame-for-inactive-tasks.patch queue-5.4/x86-unwind-orc-prevent-unwinding-before-orc-initialization.patch queue-5.4/x86-unwind-orc-fix-error-path-for-bad-orc-entry-type.patch queue-5.4/x86-entry-64-fix-unwind-hints-in-rewind_stack_do_exit.patch queue-5.4/x86-unwind-orc-fix-premature-unwind-stoppage-due-to-iret-frames.patch queue-5.4/x86-entry-64-fix-unwind-hints-in-register-clearing-code.patch queue-5.4/objtool-fix-stack-offset-tracking-for-indirect-cfas.patch queue-5.4/kvm-vmx-explicitly-clear-rflags.cf-and-rflags.zf-in-vm-exit-rsb-path.patch