fix CVE-2022-38126

This commit is contained in:
yinyongkang 2022-09-08 17:19:35 +08:00
parent e1fb11784d
commit f01aa77fc5
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 753efb93dc018558c483111fbfe14c4ee8c84c51 Mon Sep 17 00:00:00 2001
From: yinyongkang <yinyongkang@kylinos.cn>
Date: Thu, 8 Sep 2022 17:14:11 +0800
Subject: [PATCH] Replace a run-time assertion failure with a warning message
when parsing corrupt...
PR 29289
* dwarf.c (display_debug_names): Replace assert with a warning
message.
---
binutils/dwarf.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 1e7f4db7..7c54820a 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -9781,7 +9781,12 @@ display_debug_names (struct dwarf_section *section, void *file)
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.33.0

View File

@ -1,7 +1,7 @@
Summary: Binary utilities Summary: Binary utilities
Name: binutils Name: binutils
Version: 2.37 Version: 2.37
Release: 9 Release: 10
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -62,6 +62,7 @@ Patch38: 0026-opcodes-Make-i386-dis.c-thread-safe.patch
Patch39: 0027-x86-reduce-AVX512-FP16-set-of-insns-decoded-through-.patch Patch39: 0027-x86-reduce-AVX512-FP16-set-of-insns-decoded-through-.patch
Patch40: 0028-x86-reduce-AVX512-FP-set-of-insns-decoded-through-ve.patch Patch40: 0028-x86-reduce-AVX512-FP-set-of-insns-decoded-through-ve.patch
Patch41: 0029-x86-consistently-use-scalar_mode-for-AVX512-FP16-sca.patch Patch41: 0029-x86-consistently-use-scalar_mode-for-AVX512-FP16-sca.patch
Patch42: backport-CVE-2022-38126.patch
Provides: bundled(libiberty) Provides: bundled(libiberty)
@ -385,6 +386,12 @@ fi
%{_infodir}/bfd*info* %{_infodir}/bfd*info*
%changelog %changelog
* Thu Sep 8 2022 yinyongkang <yinyongkang@kylinos.cn> - 2.37-10
- Type:CVE
- ID:CVE-2022-38126
- SUG:NA
- DESC:Fix CVE-2022-38126
* Tue Aug 11 2022 dingguangya <dingguangya1@huawei.com> - 2.37-9 * Tue Aug 11 2022 dingguangya <dingguangya1@huawei.com> - 2.37-9
- Type:requirements - Type:requirements
- ID:NA - ID:NA