mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 21:06:50 +00:00
Code Issues Projects Releases Wiki Activity

[ELF] EhFrame: replace failOn with errOn

Browse Source 
These diagnostics are mostly reported by a thread during writeSections.
In LLD_IN_TEST=2 mode, when a thread calls Fatal, there will be no
output even if the process exits with code 1.
This commit is contained in:
Fangrui Song 2025-01-25 15:18:13 -08:00
parent 04d5608057
commit 19a6ac18ef
4 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lld/ELF/EhFrame.cpp
View File

@ -41,11 +41,10 @@ public:
bool hasLSDA();
private:
template <class P> void failOn(const P *loc, const Twine &msg) {
template <class P> void errOn(const P *loc, const Twine &msg) {
Ctx &ctx = isec->file->ctx;
Fatal(ctx) << "corrupted .eh_frame: " << msg << "\n>>> defined in "
<< isec->getObjMsg((const uint8_t *)loc -
isec->content().data());
Err(ctx) << "corrupted .eh_frame: " << msg << "\n>>> defined in "
<< isec->getObjMsg((const uint8_t *)loc - isec->content().data());
}
uint8_t readByte();
@ -62,8 +61,10 @@ private:
// Read a byte and advance D by one byte.
uint8_t EhReader::readByte() {
if (d.empty())
failOn(d.data(), "unexpected end of CIE");
if (d.empty()) {
errOn(d.data(), "unexpected end of CIE");
return 0;
}
uint8_t b = d.front();
d = d.slice(1);
return b;
@ -71,15 +72,18 @@ uint8_t EhReader::readByte() {
void EhReader::skipBytes(size_t count) {
if (d.size() < count)
failOn(d.data(), "CIE is too small");
errOn(d.data(), "CIE is too small");
else
d = d.slice(count);
}
// Read a null-terminated string.
StringRef EhReader::readString() {
const uint8_t *end = llvm::find(d, '\0');
if (end == d.end())
failOn(d.data(), "corrupted CIE (failed to read string)");
if (end == d.end()) {
errOn(d.data(), "corrupted CIE (failed to read string)");
return {};
}
StringRef s = toStringRef(d.slice(0, end - d.begin()));
d = d.slice(s.size() + 1);
return s;
@ -97,7 +101,7 @@ void EhReader::skipLeb128() {
if ((val & 0x80) == 0)
return;
}
failOn(errPos, "corrupted CIE (failed to read LEB128)");
errOn(errPos, "corrupted CIE (failed to read LEB128)");
}
static size_t getAugPSize(Ctx &ctx, unsigned enc) {
@ -121,12 +125,12 @@ static size_t getAugPSize(Ctx &ctx, unsigned enc) {
void EhReader::skipAugP() {
uint8_t enc = readByte();
if ((enc & 0xf0) == DW_EH_PE_aligned)
failOn(d.data() - 1, "DW_EH_PE_aligned encoding is not supported");
return errOn(d.data() - 1, "DW_EH_PE_aligned encoding is not supported");
size_t size = getAugPSize(isec->getCtx(), enc);
if (size == 0)
failOn(d.data() - 1, "unknown FDE encoding");
return errOn(d.data() - 1, "unknown FDE encoding");
if (size >= d.size())
failOn(d.data() - 1, "corrupted CIE");
return errOn(d.data() - 1, "corrupted CIE");
d = d.slice(size);
}
@ -141,9 +145,11 @@ bool elf::hasLSDA(const EhSectionPiece &p) {
StringRef EhReader::getAugmentation() {
skipBytes(8);
int version = readByte();
if (version != 1 && version != 3)
failOn(d.data() - 1,
if (version != 1 && version != 3) {
errOn(d.data() - 1,
"FDE version 1 or 3 expected, but got " + Twine(version));
return {};
}
StringRef aug = readString();
@ -174,8 +180,10 @@ uint8_t EhReader::getFdeEncoding() {
readByte();
else if (c == 'P')
skipAugP();
else if (c != 'B' && c != 'S' && c != 'G')
failOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
else if (c != 'B' && c != 'S' && c != 'G') {
errOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
break;
}
}
return DW_EH_PE_absptr;
}
@ -191,8 +199,10 @@ bool EhReader::hasLSDA() {
skipAugP();
else if (c == 'R')
readByte();
else if (c != 'B' && c != 'S' && c != 'G')
failOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
else if (c != 'B' && c != 'S' && c != 'G') {
errOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
break;
}
}
return false;
}

1
lld/test/ELF/invalid-eh-frame2.s
View File

@ -2,6 +2,7 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
# RUN: not ld.lld --eh-frame-hdr %t -o /dev/null 2>&1 | FileCheck %s
# RUN: ld.lld --eh-frame-hdr %t -o /dev/null --noinhibit-exec
# CHECK: error: corrupted .eh_frame: corrupted CIE (failed to read string)
# CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0x9)

1
lld/test/ELF/invalid-eh-frame4.s
View File

@ -2,6 +2,7 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
# RUN: not ld.lld --eh-frame-hdr %t -o /dev/null 2>&1 | FileCheck %s
# RUN: ld.lld --eh-frame-hdr %t -o /dev/null --noinhibit-exec 2>&1 | FileCheck %s
# CHECK: corrupted .eh_frame: unknown .eh_frame augmentation string:

1
lld/test/ELF/invalid-eh-frame6.s
View File

@ -2,6 +2,7 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
# RUN: not ld.lld --eh-frame-hdr %t -o /dev/null 2>&1 | FileCheck %s
# RUN: ld.lld --eh-frame-hdr %t -o /dev/null --noinhibit-exec
# CHECK: error: corrupted .eh_frame: unknown FDE encoding
# CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0xe)