From 640a8fa0d20cc7b2a9ac32aab004aca65ad7a1cf Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 13 Dec 2023 12:34:12 +0000 Subject: [PATCH] UBUNTU: SAUCE: objtool: make objtool SLS validation fatal when building with CONFIG_SLS=y BugLink: https://bugs.launchpad.net/bugs/2046440 Make objtool SLS validation fatal when building with CONFIG_SLS=y, currently it is a build.log warning only. This is a standalone patch, such that if regressions are identified (with any config or toolchain configuration) it can be reverted until relevant identified code is fixed up or otherwise ignored/silecned/marked as safe. Signed-off-by: Dimitri John Ledkov Link: https://lore.kernel.org/all/20231213134303.2302285-3-dimitri.ledkov@canonical.com/ Signed-off-by: Andrea Righi --- tools/objtool/check.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 1fec35cdc206..788a20b4bd98 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4500,7 +4500,9 @@ static int validate_sls(struct objtool_file *file) } } - return warnings; + /* SLS is an optional security safety feature, make it fatal + * to ensure no new code is introduced that fails SLS */ + return -warnings; } static bool ignore_noreturn_call(struct instruction *insn)