[llvm] [llvm][ELF]Add Shdr check for getBuildID (PR #126537)
Ruoyu Qiu via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 13 04:32:49 PST 2025
https://github.com/cabbaken updated https://github.com/llvm/llvm-project/pull/126537
>From a19e1a05cde04298aee6732811353d1814d21eb8 Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Mon, 10 Feb 2025 15:56:31 +0000
Subject: [PATCH 1/7] [llvm-objdump][ELF]Add Shdr buildID check(#126418)
Add Section Header check for getBuildID, fix crash
with invalid Program Header.
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/lib/Object/BuildID.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/llvm/lib/Object/BuildID.cpp b/llvm/lib/Object/BuildID.cpp
index 89d6bc3ab550d..d446057129827 100644
--- a/llvm/lib/Object/BuildID.cpp
+++ b/llvm/lib/Object/BuildID.cpp
@@ -24,6 +24,20 @@ using namespace llvm::object;
namespace {
template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
+ auto Sections = cantFail(Obj.sections());
+ if (!Sections.empty()) {
+ for (const auto &S : Sections) {
+ if (S.sh_type != ELF::SHT_NOTE)
+ continue;
+ Error Err = Error::success();
+ for (auto N : Obj.notes(S, Err))
+ if (N.getType() == ELF::NT_GNU_BUILD_ID &&
+ N.getName() == ELF::ELF_NOTE_GNU)
+ return N.getDesc(S.sh_addralign);
+ consumeError(std::move(Err));
+ }
+ }
+
auto PhdrsOrErr = Obj.program_headers();
if (!PhdrsOrErr) {
consumeError(PhdrsOrErr.takeError());
>From 169f9db3abaf765d58a4f7fd3e8cbc44469fafbe Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Tue, 11 Feb 2025 08:29:19 +0000
Subject: [PATCH 2/7] [LLVM][ELF]Add Align check for getDesc()
Add Aligh check to avoid crashing if Aligh is 0.
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/include/llvm/Object/ELFTypes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/include/llvm/Object/ELFTypes.h b/llvm/include/llvm/Object/ELFTypes.h
index 87e4dbe448091..8441009900316 100644
--- a/llvm/include/llvm/Object/ELFTypes.h
+++ b/llvm/include/llvm/Object/ELFTypes.h
@@ -660,7 +660,7 @@ class Elf_Note_Impl {
/// Get the note's descriptor.
ArrayRef<uint8_t> getDesc(size_t Align) const {
- if (!Nhdr.n_descsz)
+ if (!Nhdr.n_descsz || !Align)
return ArrayRef<uint8_t>();
return ArrayRef<uint8_t>(
reinterpret_cast<const uint8_t *>(&Nhdr) +
>From 0c6d355e70a8d563c42a53b33dc87854d91b4cba Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Wed, 12 Feb 2025 10:49:06 +0000
Subject: [PATCH 3/7] Optimize getBuildID() code style
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/lib/Object/BuildID.cpp | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/llvm/lib/Object/BuildID.cpp b/llvm/lib/Object/BuildID.cpp
index d446057129827..08f1502b362b0 100644
--- a/llvm/lib/Object/BuildID.cpp
+++ b/llvm/lib/Object/BuildID.cpp
@@ -24,20 +24,27 @@ using namespace llvm::object;
namespace {
template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
+ auto findBuildID = [&Obj](const auto &ShdrOrPhdr,
+ uint64_t Alignment) -> std::optional<BuildIDRef> {
+ Error Err = Error::success();
+ for (auto N : Obj.notes(ShdrOrPhdr, Err))
+ if (N.getType() == ELF::NT_GNU_BUILD_ID &&
+ N.getName() == ELF::ELF_NOTE_GNU)
+ return N.getDesc(Alignment);
+ consumeError(std::move(Err));
+ return std::nullopt;
+ };
+
auto Sections = cantFail(Obj.sections());
if (!Sections.empty()) {
for (const auto &S : Sections) {
if (S.sh_type != ELF::SHT_NOTE)
continue;
- Error Err = Error::success();
- for (auto N : Obj.notes(S, Err))
- if (N.getType() == ELF::NT_GNU_BUILD_ID &&
- N.getName() == ELF::ELF_NOTE_GNU)
- return N.getDesc(S.sh_addralign);
- consumeError(std::move(Err));
+ auto ShdrRes = findBuildID(S, S.sh_addralign);
+ if (ShdrRes)
+ return ShdrRes.value();
}
}
-
auto PhdrsOrErr = Obj.program_headers();
if (!PhdrsOrErr) {
consumeError(PhdrsOrErr.takeError());
@@ -46,12 +53,9 @@ template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
for (const auto &P : *PhdrsOrErr) {
if (P.p_type != ELF::PT_NOTE)
continue;
- Error Err = Error::success();
- for (auto N : Obj.notes(P, Err))
- if (N.getType() == ELF::NT_GNU_BUILD_ID &&
- N.getName() == ELF::ELF_NOTE_GNU)
- return N.getDesc(P.p_align);
- consumeError(std::move(Err));
+ auto PhdrRes = findBuildID(P, P.p_align);
+ if (PhdrRes)
+ return PhdrRes.value();
}
return {};
}
>From 40ff1ffaf89597089763fa99c3cf6024bb8895da Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Thu, 13 Feb 2025 02:34:01 +0000
Subject: [PATCH 4/7] Fix alignment judge of getDesc()
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/include/llvm/Object/ELFTypes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/include/llvm/Object/ELFTypes.h b/llvm/include/llvm/Object/ELFTypes.h
index 8441009900316..87e4dbe448091 100644
--- a/llvm/include/llvm/Object/ELFTypes.h
+++ b/llvm/include/llvm/Object/ELFTypes.h
@@ -660,7 +660,7 @@ class Elf_Note_Impl {
/// Get the note's descriptor.
ArrayRef<uint8_t> getDesc(size_t Align) const {
- if (!Nhdr.n_descsz || !Align)
+ if (!Nhdr.n_descsz)
return ArrayRef<uint8_t>();
return ArrayRef<uint8_t>(
reinterpret_cast<const uint8_t *>(&Nhdr) +
>From 0a502cd7fbc1c92d81efd82fb3fc06ee5c494ea9 Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Thu, 13 Feb 2025 02:46:54 +0000
Subject: [PATCH 5/7] Add AddressAlign to symbolize-build-id.test to avoid
crashing of getDesc().
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/test/DebugInfo/symbolize-build-id.test | 1 +
1 file changed, 1 insertion(+)
diff --git a/llvm/test/DebugInfo/symbolize-build-id.test b/llvm/test/DebugInfo/symbolize-build-id.test
index d63f43ff859e6..2620718293320 100644
--- a/llvm/test/DebugInfo/symbolize-build-id.test
+++ b/llvm/test/DebugInfo/symbolize-build-id.test
@@ -21,6 +21,7 @@ Sections:
Type: SHT_NOTE
Flags: [ SHF_ALLOC ]
Content: 040000000800000003000000474e5500abb50d82b6bdc861
+ AddressAlign: 4
ProgramHeaders:
- Type: PT_NOTE
Flags: [ PF_R ]
>From 719333976b47e4b2fc60df5de32d8641fdf4e382 Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Thu, 13 Feb 2025 09:02:09 +0000
Subject: [PATCH 6/7] Optimize code style.
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/lib/Object/BuildID.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/llvm/lib/Object/BuildID.cpp b/llvm/lib/Object/BuildID.cpp
index 08f1502b362b0..860f13f921fd6 100644
--- a/llvm/lib/Object/BuildID.cpp
+++ b/llvm/lib/Object/BuildID.cpp
@@ -40,8 +40,7 @@ template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
for (const auto &S : Sections) {
if (S.sh_type != ELF::SHT_NOTE)
continue;
- auto ShdrRes = findBuildID(S, S.sh_addralign);
- if (ShdrRes)
+ if (std::optional<BuildIDRef> ShdrRes = findBuildID(S, S.sh_addralign))
return ShdrRes.value();
}
}
@@ -53,8 +52,7 @@ template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
for (const auto &P : *PhdrsOrErr) {
if (P.p_type != ELF::PT_NOTE)
continue;
- auto PhdrRes = findBuildID(P, P.p_align);
- if (PhdrRes)
+ if (std::optional<BuildIDRef> PhdrRes = findBuildID(P, P.p_align))
return PhdrRes.value();
}
return {};
>From c388efa7804702b6decc726eef8149e8d594cbfb Mon Sep 17 00:00:00 2001
From: Ruoyu Qiu <cabbaken at outlook.com>
Date: Thu, 13 Feb 2025 11:40:10 +0000
Subject: [PATCH 7/7] remove unneeded empty check
Signed-off-by: Ruoyu Qiu <cabbaken at outlook.com>
---
llvm/lib/Object/BuildID.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/llvm/lib/Object/BuildID.cpp b/llvm/lib/Object/BuildID.cpp
index 860f13f921fd6..d1ee597a11327 100644
--- a/llvm/lib/Object/BuildID.cpp
+++ b/llvm/lib/Object/BuildID.cpp
@@ -36,13 +36,11 @@ template <typename ELFT> BuildIDRef getBuildID(const ELFFile<ELFT> &Obj) {
};
auto Sections = cantFail(Obj.sections());
- if (!Sections.empty()) {
- for (const auto &S : Sections) {
- if (S.sh_type != ELF::SHT_NOTE)
- continue;
- if (std::optional<BuildIDRef> ShdrRes = findBuildID(S, S.sh_addralign))
- return ShdrRes.value();
- }
+ for (const auto &S : Sections) {
+ if (S.sh_type != ELF::SHT_NOTE)
+ continue;
+ if (std::optional<BuildIDRef> ShdrRes = findBuildID(S, S.sh_addralign))
+ return ShdrRes.value();
}
auto PhdrsOrErr = Obj.program_headers();
if (!PhdrsOrErr) {
More information about the llvm-commits
mailing list