diff --git a/CVE-2023-37732.patch b/CVE-2023-37732.patch new file mode 100644 index 0000000000000000000000000000000000000000..84b937358e2cbe69726910708ac75245823c2585 --- /dev/null +++ b/CVE-2023-37732.patch @@ -0,0 +1,37 @@ +From 2cd3bb50e256f5ed5f611ac611d25fe673f2cec3 Mon Sep 17 00:00:00 2001 +From: Peter Johnson +Date: Fri, 30 Jun 2023 08:08:55 -0700 +Subject: [PATCH] elf.c: Fix NULL deref on bad xsize expression (#234) + +--- + modules/objfmts/elf/elf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c +index 67fe3f26..1ee98bfd 100644 +--- a/modules/objfmts/elf/elf.c ++++ b/modules/objfmts/elf/elf.c +@@ -482,15 +482,15 @@ elf_symtab_write_to_file(FILE *f, elf_symtab_head *symtab, + + /* get size (if specified); expr overrides stored integer */ + if (entry->xsize) { +- size_intn = yasm_intnum_copy( +- yasm_expr_get_intnum(&entry->xsize, 1)); +- if (!size_intn) { ++ yasm_intnum *intn = yasm_expr_get_intnum(&entry->xsize, 1); ++ if (!intn) { + yasm_error_set(YASM_ERROR_VALUE, + N_("size specifier not an integer expression")); + yasm_errwarn_propagate(errwarns, entry->xsize->line); +- } ++ } else ++ size_intn = yasm_intnum_copy(intn); + } +- else ++ if (!size_intn) + size_intn = yasm_intnum_create_uint(entry->size); + + /* get EQU value for constants */ +-- +2.41.0.windows.3 + diff --git a/yasm.spec b/yasm.spec index 033b77052737091ea8c65eddd8c891e98b967f35..0f6a7e7f816556ffad3aaec6e4bb5d7cad0e03e2 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,11 +1,12 @@ Name: yasm Version: 1.3.0 -Release: 10 +Release: 11 Summary: NASM assembler License: BSD URL: http://yasm.tortall.net/ Source0: http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz Patch1: yasm-1.3.0-sw.patch +Patch2: CVE-2023-37732.patch BuildRequires: gcc bison byacc gettext-devel xmlto Provides: bundled(md5-plumb) @@ -47,6 +48,9 @@ rm -rf %{buildroot} %{_mandir}/* %changelog +* Fri Aug 11 2023 liningjie - 1.3.0-11 +- fix CVE-2023-37732 + * Wed Oct 26 2022 wuzx - 1.3.0-10 - Add sw64 architecture