diff options
author | Soumya <soumya.sambu@windriver.com> | 2023-08-18 14:38:04 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2024-01-12 07:14:16 -0500 |
commit | 7f5ded2c880947f6866509ea19a49ca4fe5e0357 (patch) | |
tree | ccb32ef3f517b80e560fe1d43c337ac1fab73255 | |
parent | 402affcc073db39f782c1ebfd718edd5f11eed4c (diff) | |
download | meta-openembedded-7f5ded2c880947f6866509ea19a49ca4fe5e0357.tar.gz |
yasm: fix CVE-2023-37732
Yasm v1.3.0.78 was found prone to NULL Pointer Dereference in /libyasm/intnum.c
and /elf/elf.c, which allows the attacker to cause a denial of service via a
crafted file.
References:
https://github.com/yasm/yasm/issues/233
https://nvd.nist.gov/vuln/detail/CVE-2023-37732
Signed-off-by: Soumya <soumya.sambu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit 41fffef6b044b2722aa13f7e7648a3f848231851)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/yasm/yasm_git.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch new file mode 100644 index 000000000..1ca33f0a9 --- /dev/null +++ b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 2cd3bb50e256f5ed5f611ac611d25fe673f2cec3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Johnson <johnson.peter@gmail.com> | ||
3 | Date: Fri, 11 Aug 2023 10:49:51 +0000 | ||
4 | Subject: [PATCH] elf.c: Fix NULL deref on bad xsize expression (#234) | ||
5 | |||
6 | CVE: CVE-2023-37732 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/yasm/yasm/commit/2cd3bb50e256f5ed5f611ac611d25fe673f2cec3] | ||
9 | |||
10 | Signed-off-by: Soumya <soumya.sambu@windriver.com> | ||
11 | --- | ||
12 | modules/objfmts/elf/elf.c | 10 +++++----- | ||
13 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c | ||
16 | index 2486bba8..bab4c9ca 100644 | ||
17 | --- a/modules/objfmts/elf/elf.c | ||
18 | +++ b/modules/objfmts/elf/elf.c | ||
19 | @@ -482,15 +482,15 @@ elf_symtab_write_to_file(FILE *f, elf_symtab_head *symtab, | ||
20 | |||
21 | /* get size (if specified); expr overrides stored integer */ | ||
22 | if (entry->xsize) { | ||
23 | - size_intn = yasm_intnum_copy( | ||
24 | - yasm_expr_get_intnum(&entry->xsize, 1)); | ||
25 | - if (!size_intn) { | ||
26 | + yasm_intnum *intn = yasm_expr_get_intnum(&entry->xsize, 1); | ||
27 | + if (!intn) { | ||
28 | yasm_error_set(YASM_ERROR_VALUE, | ||
29 | N_("size specifier not an integer expression")); | ||
30 | yasm_errwarn_propagate(errwarns, entry->xsize->line); | ||
31 | - } | ||
32 | + } else | ||
33 | + size_intn = yasm_intnum_copy(intn); | ||
34 | } | ||
35 | - else | ||
36 | + if (!size_intn) | ||
37 | size_intn = yasm_intnum_create_uint(entry->size); | ||
38 | |||
39 | /* get EQU value for constants */ | ||
40 | -- | ||
41 | 2.40.0 | ||
diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb index 5c3562300..60b00f7ff 100644 --- a/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb | |||
@@ -12,6 +12,7 @@ SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" | |||
12 | SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ |
13 | file://0001-Do-not-use-AC_HEADER_STDC.patch \ | 13 | file://0001-Do-not-use-AC_HEADER_STDC.patch \ |
14 | file://CVE-2023-31975.patch \ | 14 | file://CVE-2023-31975.patch \ |
15 | file://CVE-2023-37732.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |