From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Michael Forney <mforney@mforney.org>,
Miroslav Benes <mbenes@suse.cz>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Sasha Levin <sashal@kernel.org>,
peterz@infradead.org
Subject: [PATCH AUTOSEL 5.14 08/26] objtool: Check for gelf_update_rel[a] failures
Date: Wed, 20 Oct 2021 20:20:05 -0400 [thread overview]
Message-ID: <20211021002023.1128949-8-sashal@kernel.org> (raw)
In-Reply-To: <20211021002023.1128949-1-sashal@kernel.org>
From: Michael Forney <mforney@mforney.org>
[ Upstream commit b46179d6bb3182c020f2bf9bb4df6ba5463b0495 ]
Otherwise, if these fail we end up with garbage data in the
.rela.orc_unwind_ip section, leading to errors like
ld: fs/squashfs/namei.o: bad reloc symbol index (0x7f16 >= 0x12) for offset 0x7f16d5c82cc8 in section `.orc_unwind_ip'
Signed-off-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20210509000103.11008-1-mforney@mforney.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
tools/objtool/elf.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 8676c7598728..6cf4c0f11906 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -1003,7 +1003,10 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr)
list_for_each_entry(reloc, &sec->reloc_list, list) {
reloc->rel.r_offset = reloc->offset;
reloc->rel.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
- gelf_update_rel(sec->data, idx, &reloc->rel);
+ if (!gelf_update_rel(sec->data, idx, &reloc->rel)) {
+ WARN_ELF("gelf_update_rel");
+ return -1;
+ }
idx++;
}
@@ -1035,7 +1038,10 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr)
reloc->rela.r_offset = reloc->offset;
reloc->rela.r_addend = reloc->addend;
reloc->rela.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
- gelf_update_rela(sec->data, idx, &reloc->rela);
+ if (!gelf_update_rela(sec->data, idx, &reloc->rela)) {
+ WARN_ELF("gelf_update_rela");
+ return -1;
+ }
idx++;
}
--
2.33.0
next prev parent reply other threads:[~2021-10-21 0:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 0:19 [PATCH AUTOSEL 5.14 01/26] kunit: fix reference count leak in kfree_at_end Sasha Levin
2021-10-21 0:19 ` [PATCH AUTOSEL 5.14 02/26] drm/msm/a6xx: Serialize GMU communication Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 03/26] gcc-plugins/structleak: add makefile var for disabling structleak Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 04/26] iio/test-format: build kunit tests without structleak plugin Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 05/26] device property: " Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 06/26] thunderbolt: " Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 07/26] bitfield: " Sasha Levin
2021-10-21 0:20 ` Sasha Levin [this message]
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 09/26] objtool: Update section header before relocations Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 10/26] ALSA: hda: intel: Allow repeatedly probing on codec configuration errors Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 11/26] btrfs: deal with errors when checking if a dir entry exists during log replay Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 12/26] net: stmmac: add support for dwmac 3.40a Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 13/26] ARM: dts: spear3xx: Fix gmac node Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 14/26] nfc: nci: fix the UAF of rf_conn_info object Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 15/26] isdn: cpai: check ctr->cnr to avoid array index out of bound Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 16/26] isdn: mISDN: Fix sleeping function called from invalid context Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 17/26] platform/x86: intel_scu_ipc: Increase virtual timeout to 10s Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 18/26] platform/x86: intel_scu_ipc: Update timeout value in comment Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 19/26] ALSA: hda: avoid write to STATESTS if controller is in reset Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 20/26] spi: Fix deadlock when adding SPI controllers on SPI buses Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 21/26] spi-mux: Fix false-positive lockdep splats Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 22/26] libperf test evsel: Fix build error on !x86 architectures Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 23/26] libperf tests: Fix test_stat_cpu Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 24/26] perf/x86/msr: Add Sapphire Rapids CPU support Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 25/26] Input: snvs_pwrkey - add clk handling Sasha Levin
2021-10-21 0:20 ` [PATCH AUTOSEL 5.14 26/26] Input: xpad - add support for another USB ID of Nacon GC-100 Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021002023.1128949-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mforney@mforney.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).