From d07c8f4a2f3f1632458aaf6c26c146b91a6f8636 Mon Sep 17 00:00:00 2001 From: Lv Ying Date: Sat, 31 Jul 2021 15:42:08 +0800 Subject: [PATCH] _dl_exception_create_format: Add missing va_end Signed-off-by: Lv Ying (cherry picked from commit 0222dab421330bf19186099b64a002d8c0bdd1fa) --- ...ion_create_format-Add-missing-va_end.patch | 25 +++++++++++++++++++ glibc.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backport-_dl_exception_create_format-Add-missing-va_end.patch diff --git a/backport-_dl_exception_create_format-Add-missing-va_end.patch b/backport-_dl_exception_create_format-Add-missing-va_end.patch new file mode 100644 index 0000000..5420019 --- /dev/null +++ b/backport-_dl_exception_create_format-Add-missing-va_end.patch @@ -0,0 +1,25 @@ +From 0c4dcaf641089d64011c1eb9c45542ae43a87d5e Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Tue, 11 May 2021 09:04:29 +0530 +Subject: [PATCH] _dl_exception_create_format: Add missing va_end + +Coverity discovered a missing va_end. +--- + elf/dl-exception.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/elf/dl-exception.c b/elf/dl-exception.c +index 1c63e4a3a65b..5cfe2002d29f 100644 +--- a/elf/dl-exception.c ++++ b/elf/dl-exception.c +@@ -187,6 +187,7 @@ _dl_exception_create_format (struct dl_exception *exception, const char *objname + if (len_objname != end - wptr) + length_mismatch (); + exception->objname = memcpy (wptr, objname, len_objname); ++ va_end (ap); + } + } + rtld_hidden_def (_dl_exception_create_format) +-- +2.18.4 + diff --git a/glibc.spec b/glibc.spec index e5167a3..d3b90c1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -59,7 +59,7 @@ ############################################################################## Name: glibc Version: 2.28 -Release: 74 +Release: 75 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -132,6 +132,7 @@ Patch48: backport-ldconfig-handle-.dynstr-located-in-separate-segment-.patch Patch49: backport-CVE-2021-35942-wordexp-handle-overflow-in-positional-parameter-numb.patch Patch50: backport-malloc-Initiate-tcache-shutdown-even-without-allocat.patch Patch51: backport-ldconfig-Fix-memory-leaks.patch +Patch52: backport-_dl_exception_create_format-Add-missing-va_end.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -1156,6 +1157,10 @@ fi %doc hesiod/README.hesiod %changelog +* Sat Jul 31 2021 Lv Ying - 2.28-75 +- _dl_exception_create_format: Add missing va_end + https://sourceware.org/git/?p=glibc.git;a=commit;h=81046e2812a3b41ad9a818eb42a1681bea232ce9 + * Sat Jul 31 2021 Lv Ying - 2.28-74 - ldconfig: Fix memory leaks https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=468d772e81e9842f4f73431c164b4a12f13d8658 -- Gitee