From: pgowda <pgowda....@gmail.com>
Upstream-Status: Backport
[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e3e5ae049371a27fd1737aba946fe26d06e029b5]
Signed-off-by: pgowda <pgowda....@gmail.com>
---
.../binutils/binutils-2.38.inc | 1 +
.../binutils/0016-CVE-2022-38126.patch | 34 +++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-devtools/binutils/binutils/0016-CVE-2022-38126.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc
b/meta/recipes-devtools/binutils/binutils-2.38.inc
index 8aa8295881..2ddeb0ed39 100644
--- a/meta/recipes-devtools/binutils/binutils-2.38.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.38.inc
@@ -34,5 +34,6 @@ SRC_URI = "\
file://0013-Avoid-as-info-race-condition.patch \
file://0014-CVE-2019-1010204.patch \
file://0015-CVE-2022-38533.patch \
+ file://0016-CVE-2022-38126.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0016-CVE-2022-38126.patch
b/meta/recipes-devtools/binutils/binutils/0016-CVE-2022-38126.patch
new file mode 100644
index 0000000000..8200e28a81
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0016-CVE-2022-38126.patch
@@ -0,0 +1,34 @@
+From e3e5ae049371a27fd1737aba946fe26d06e029b5 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <ni...@redhat.com>
+Date: Mon, 27 Jun 2022 13:43:02 +0100
+Subject: [PATCH] Replace a run-time assertion failure with a warning message
+ when parsing corrupt DWARF data.
+
+ PR 29289
+ * dwarf.c (display_debug_names): Replace assert with a warning
+ message.
+
+Upstream-Status: Backport
[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e3e5ae049371a27fd1737aba946fe26d06e029b5]
+
+Signed-off-by: Pgowda <pgowda....@gmail.com>
+---
+ binutils/dwarf.c | 7 ++++++-
+
+diff --git a/binutils/dwarf.c b/binutils/dwarf.c
+index 37b477b886d..b99c56987da 100644
+--- a/binutils/dwarf.c
++++ b/binutils/dwarf.c
+@@ -9802,7 +9802,12 @@ display_debug_names (struct dwarf_sectio
+ printf (_("Out of %lu items there are %zu bucket clashes"
+ " (longest of %zu entries).\n"),
+ (unsigned long) name_count, hash_clash_count, longest_clash);
+- assert (name_count == buckets_filled + hash_clash_count);
++
++ if (name_count != buckets_filled + hash_clash_count)
++ warn (_("The name_count (%lu) is not the same as the used bucket_count
(%lu) + the hash clash count (%lu)"),
++ (unsigned long) name_count,
++ (unsigned long) buckets_filled,
++ (unsigned long) hash_clash_count);
+
+ struct abbrev_lookup_entry
+ {
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170686):
https://lists.openembedded.org/g/openembedded-core/message/170686
Mute This Topic: https://lists.openembedded.org/mt/93697203/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
