This is a note to let you know that I've just added the patch titled
objtool: Add a missing comma to avoid string concatenation
to the 4.19-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:
objtool-add-a-missing-comma-to-avoid-string-concatenation.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Feb 3 01:28:58 2023
From: Eric Biggers <ebiggers@xxxxxxxxxx>
Date: Thu, 2 Feb 2023 16:27:06 -0800
Subject: objtool: Add a missing comma to avoid string concatenation
To: stable@xxxxxxxxxxxxxxx
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@xxxxxxxxxx>, Kees Cook <keescook@xxxxxxxxxxxx>, SeongJae Park <sj@xxxxxxxxxx>, Seth Jenkins <sethjenkins@xxxxxxxxxx>, Jann Horn <jannh@xxxxxxxxxx>, "Eric W . Biederman" <ebiederm@xxxxxxxxxxxx>, linux-hardening@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, kernel test robot <lkp@xxxxxxxxx>
Message-ID: <20230203002717.49198-5-ebiggers@xxxxxxxxxx>
From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
commit 1fb466dff904e4a72282af336f2c355f011eec61 upstream.
Recently the kbuild robot reported two new errors:
>> lib/kunit/kunit-example-test.o: warning: objtool: .text.unlikely: unexpected end of section
>> arch/x86/kernel/dumpstack.o: warning: objtool: oops_end() falls through to next function show_opcodes()
I don't know why they did not occur in my test setup but after digging
it I realized I had accidentally dropped a comma in
tools/objtool/check.c when I renamed rewind_stack_do_exit to
rewind_stack_and_make_dead.
Add that comma back to fix objtool errors.
Link: https://lkml.kernel.org/r/202112140949.Uq5sFKR1-lkp@xxxxxxxxx
Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/objtool/check.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -168,7 +168,7 @@ static int __dead_end_function(struct ob
"fortify_panic",
"usercopy_abort",
"machine_real_restart",
- "rewind_stack_and_make_dead"
+ "rewind_stack_and_make_dead",
};
if (func->bind == STB_WEAK)
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-4.19/panic-unset-panic_on_warn-inside-panic.patch
queue-4.19/objtool-add-a-missing-comma-to-avoid-string-concatenation.patch
queue-4.19/hexagon-fix-function-name-in-die.patch
queue-4.19/exit-add-and-use-make_task_dead.patch
queue-4.19/h8300-fix-build-errors-from-do_exit-to-make_task_dead-transition.patch
queue-4.19/panic-consolidate-open-coded-panic_on_warn-checks.patch
queue-4.19/exit-put-an-upper-limit-on-how-often-we-can-oops.patch
queue-4.19/panic-introduce-warn_limit.patch
queue-4.19/exit-allow-oops_limit-to-be-disabled.patch
queue-4.19/ia64-make-ia64_mca_recovery-bool-instead-of-tristate.patch
queue-4.19/exit-use-read_once-for-all-oops-warn-limit-reads.patch
queue-4.19/exit-expose-oops_count-to-sysfs.patch
queue-4.19/panic-expose-warn_count-to-sysfs.patch
queue-4.19/docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
queue-4.19/sysctl-add-a-new-register_sysctl_init-interface.patch
