Re: [PATCH] objtool: Add fortify_panic as __noreturn function

Stephen Rothwell
2017-06-15T04:06:31Z

Hi Kees,

On Wed, 14 Jun 2017 19:18:51 -0700 Kees Cook <keescook@chromium.org> wrote:
>
> CONFIG_FORTIFY_SOURCE implements fortify_panic() as a __noreturn function,
> so objtool needs to know about it too.
>
> Suggested-by: Daniel Micay <danielmicay@gmail.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Cc: Josh Poimboeuf <jpoimboe@redhat.com>
> ---
> tools/objtool/builtin-check.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
> index 282a60368b14..5f66697fe1e0 100644
> --- a/tools/objtool/builtin-check.c
> +++ b/tools/objtool/builtin-check.c
> @@ -192,7 +192,8 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
> "complete_and_exit",
> "kvm_spurious_fault",
> "__reiserfs_panic",
> - "lbug_with_loc"
> + "lbug_with_loc",
> + "fortify_panic",
> };
>
> if (func->bind == STB_WEAK)
> --
> 2.7.4

OK, I have added this to the end of linux-next today (in the part of
Andrew's tree afte the linux-next merge). I also move the fortify
string patch to after it (but I assume I will still need to revert it).

I willl drop this patch when it appears elsewhere in linux-next.