Commit cbeaa41d authored by Miguel Ojeda's avatar Miguel Ojeda
Browse files

objtool/rust: relax slice condition to cover more `noreturn` Rust functions 



Developers are indeed hitting other of the `noreturn` slice symbols in
Nova [1], thus relax the last check in the list so that we catch all of
them, i.e.

    *_4core5slice5index22slice_index_order_fail
    *_4core5slice5index24slice_end_index_len_fail
    *_4core5slice5index26slice_start_index_len_fail
    *_4core5slice5index29slice_end_index_overflow_fail
    *_4core5slice5index31slice_start_index_overflow_fail

These all exist since at least Rust 1.78.0, thus backport it too.

See commit 56d680dd ("objtool/rust: list `noreturn` Rust functions")
for more details.

Cc: stable@vger.kernel.org # Needed in 6.12.y and later.
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Timur Tabi <ttabi@nvidia.com>
Cc: Kane York <kanepyork@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Reported-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Fixes: 56d680dd ("objtool/rust: list `noreturn` Rust functions")
Closes: https://lore.kernel.org/rust-for-linux/20250513180757.GA1295002@joelnvbox/

 [1]
Tested-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Link: https://lore.kernel.org/r/20250520185555.825242-1-ojeda@kernel.org


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 19574604

tools/objtool/check.c

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ static bool is_rust_noreturn(const struct symbol *func) 
	       str_ends_with(func->name, "_7___rustc17rust_begin_unwind")				||

	       strstr(func->name, "_4core9panicking13assert_failed")					||

	       strstr(func->name, "_4core9panicking11panic_const24panic_const_")			||

	       (strstr(func->name, "_4core5slice5index24slice_") &&

	       (strstr(func->name, "_4core5slice5index") &&

		strstr(func->name, "slice_") &&

		str_ends_with(func->name, "_fail"));

}