]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Jan 2021 10:12:39 +0000 (11:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Jan 2021 10:12:39 +0000 (11:12 +0100)
added patches:
objtool-don-t-fail-on-missing-symbol-table.patch

queue-5.10/objtool-don-t-fail-on-missing-symbol-table.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/objtool-don-t-fail-on-missing-symbol-table.patch b/queue-5.10/objtool-don-t-fail-on-missing-symbol-table.patch
new file mode 100644 (file)
index 0000000..3df6e57
--- /dev/null
@@ -0,0 +1,47 @@
+From 1d489151e9f9d1647110277ff77282fe4d96d09b Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Thu, 14 Jan 2021 16:14:01 -0600
+Subject: objtool: Don't fail on missing symbol table
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit 1d489151e9f9d1647110277ff77282fe4d96d09b upstream.
+
+Thanks to a recent binutils change which doesn't generate unused
+symbols, it's now possible for thunk_64.o be completely empty without
+CONFIG_PREEMPTION: no text, no data, no symbols.
+
+We could edit the Makefile to only build that file when
+CONFIG_PREEMPTION is enabled, but that will likely create confusion
+if/when the thunks end up getting used by some other code again.
+
+Just ignore it and move on.
+
+Reported-by: Nathan Chancellor <natechancellor@gmail.com>
+Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
+Reviewed-by: Miroslav Benes <mbenes@suse.cz>
+Tested-by: Nathan Chancellor <natechancellor@gmail.com>
+Link: https://github.com/ClangBuiltLinux/linux/issues/1254
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/objtool/elf.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/tools/objtool/elf.c
++++ b/tools/objtool/elf.c
+@@ -354,8 +354,11 @@ static int read_symbols(struct elf *elf)
+       symtab = find_section_by_name(elf, ".symtab");
+       if (!symtab) {
+-              WARN("missing symbol table");
+-              return -1;
++              /*
++               * A missing symbol table is actually possible if it's an empty
++               * .o file.  This can happen for thunk_64.o.
++               */
++              return 0;
+       }
+       symtab_shndx = find_section_by_name(elf, ".symtab_shndx");
index 5d5595f5372013ed1dcdd3416eebe3a491b2cecd..5f1c6a1896218ba7a99a74efb96aeb7f699e4fd1 100644 (file)
@@ -24,3 +24,4 @@ io_uring-fix-uring_flush-in-exit_files-warning.patch
 io_uring-fix-skipping-disabling-sqo-on-exec.patch
 io_uring-dont-kill-fasync-under-completion_lock.patch
 io_uring-fix-sleeping-under-spin-in-__io_clean_op.patch
+objtool-don-t-fail-on-missing-symbol-table.patch