diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2020-07-17 12:04:27 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2021-02-23 12:46:57 -0800 |
| commit | 0e731dbc18241d68318e0a7d2c2c0087c9073fb9 (patch) | |
| tree | f84a8f54bed013cb49dc370484745143abc72133 | |
| parent | 18a14575ae31c5a97a5e87e961932a5016d369be (diff) | |
| download | lwn-0e731dbc18241d68318e0a7d2c2c0087c9073fb9.tar.gz lwn-0e731dbc18241d68318e0a7d2c2c0087c9073fb9.zip | |
objtool: Don't autodetect vmlinux.o
With LTO, we run objtool on vmlinux.o, but don't want noinstr
validation. This change requires --vmlinux to be passed to objtool
explicitly.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
| -rwxr-xr-x | scripts/link-vmlinux.sh | 2 | ||||
| -rw-r--r-- | tools/objtool/builtin-check.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index c5919d5a0b4f..423a4106f0dd 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -106,7 +106,7 @@ objtool_link() local objtoolopt; if [ -n "${CONFIG_VMLINUX_VALIDATION}" ]; then - objtoolopt="check" + objtoolopt="check --vmlinux" if [ -z "${CONFIG_FRAME_POINTER}" ]; then objtoolopt="${objtoolopt} --no-fp" fi diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index e92e76f69176..facfc10bc5dc 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -41,7 +41,7 @@ const struct option check_options[] = { int cmd_check(int argc, const char **argv) { - const char *objname, *s; + const char *objname; struct objtool_file *file; int ret; @@ -52,10 +52,6 @@ int cmd_check(int argc, const char **argv) objname = argv[0]; - s = strstr(objname, "vmlinux.o"); - if (s && !s[9]) - vmlinux = true; - file = objtool_open_read(objname); if (!file) return 1; |