diff --git a/backport-CVE-2021-33294-readelf-Sanity-check-verneed-and-verdef-offsets-in-h.patch b/backport-CVE-2021-33294-readelf-Sanity-check-verneed-and-verdef-offsets-in-h.patch new file mode 100644 index 0000000000000000000000000000000000000000..f14556e69b3dd9cb304784e8bb951caf37a81ece --- /dev/null +++ b/backport-CVE-2021-33294-readelf-Sanity-check-verneed-and-verdef-offsets-in-h.patch @@ -0,0 +1,55 @@ +From 480b6fa3662ba8ffeee274bf0d37423413c01e55 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 3 Mar 2021 21:40:53 +0100 +Subject: [PATCH] readelf: Sanity check verneed and verdef offsets in + handle_symtab. + +We are going through vna_next, vn_next and vd_next in a while loop. +Make sure that all offsets are sane. We don't want things to wrap +around so we go in cycles. + +https://sourceware.org/bugzilla/show_bug.cgi?id=27501 + +Signed-off-by: Mark Wielaard +--- + src/readelf.c | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/readelf.c b/src/readelf.c +index 715af3b3..b9740455 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -2554,7 +2554,9 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) + &vernaux_mem); + while (vernaux != NULL + && vernaux->vna_other != *versym +- && vernaux->vna_next != 0) ++ && vernaux->vna_next != 0 ++ && (verneed_data->d_size - vna_offset ++ >= vernaux->vna_next)) + { + /* Update the offset. */ + vna_offset += vernaux->vna_next; +@@ -2571,6 +2573,9 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) + /* Found it. */ + break; + ++ if (verneed_data->d_size - vn_offset < verneed->vn_next) ++ break; ++ + vn_offset += verneed->vn_next; + verneed = (verneed->vn_next == 0 + ? NULL +@@ -2606,6 +2611,9 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) + /* Found the definition. */ + break; + ++ if (verdef_data->d_size - vd_offset < verdef->vd_next) ++ break; ++ + vd_offset += verdef->vd_next; + verdef = (verdef->vd_next == 0 + ? NULL +-- +2.27.0 + diff --git a/elfutils.spec b/elfutils.spec index a7ca461c7aafcf06010adb2e0c314cea1e782dc3..154a920c4d509c1c22bd9a3ce01dec56a332991e 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ # -*- rpm-spec from http://elfutils.org/ -*- Name: elfutils Version: 0.180 -Release: 13 +Release: 14 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data URL: http://elfutils.org/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -11,6 +11,7 @@ Patch0: backport-elfclassify-Fix-no-stdin-flag.patch Patch1: Fix-error-of-parsing-object-file-perms.patch Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch Patch3: Get-instance-correctly-for-eu-ar-N-option.patch +Patch4: backport-CVE-2021-33294-readelf-Sanity-check-verneed-and-verdef-offsets-in-h.patch Provides: elfutils-libelf elfutils-default-yama-scope default-yama-scope elfutils-libs Obsoletes: elfutils-libelf < %{version}-%{release} elfutils-default-yama-scope < %{version}-%{release} elfutils-libs < %{version}-%{release} @@ -256,6 +257,12 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Wed Jul 19 2023 fuanan - 0.180-14 +- Type:CVE +- ID:CVE-2021-33294 +- SUG:NA +- DESC:Fix CVE-2021-33294 + * Mon Oct 31 2022 zhangruifang - 0.180-13 - Type:bugfix - ID:NA