packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: Avoid closing -1 onfaiure in __closefrom_fallback

Browse Source
This commit is contained in:
liqingqing_1229 2022-05-30 10:31:09 +08:00
parent 018e7b964c
commit f1754a4f67
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Linux-Avoid-closing-1-on-failure-in-__closefrom_fall.patch Normal file
View File

@ -0,0 +1,26 @@
From 5ad9d62c3b7438c70452d6a9b2c7810f9f28bf32 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 24 Sep 2021 19:51:41 +0200
Subject: [PATCH] Linux: Avoid closing -1 on failure in __closefrom_fallback
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
---
sysdeps/unix/sysv/linux/closefrom_fallback.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/closefrom_fallback.c b/sysdeps/unix/sysv/linux/closefrom_fallback.c
index 9cca556..f215fd2 100644
--- a/sysdeps/unix/sysv/linux/closefrom_fallback.c
+++ b/sysdeps/unix/sysv/linux/closefrom_fallback.c
@@ -48,7 +48,7 @@ __closefrom_fallback (int from, _Bool dirfd_fallback)
dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
0);
if (dirfd == -1)
- goto err;
+ return false;
}
char buffer[1024];
--
1.8.3.1

6
glibc.spec
View File

@ -66,7 +66,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 82 Release: 83
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
@ -222,6 +222,7 @@ Patch134: linux-Fix-fchmodat-with-AT_SYMLINK_NOFOLLOW-for-64-b.patch
Patch135: linux-Fix-posix_spawn-return-code-if-clone-fails-BZ-.patch Patch135: linux-Fix-posix_spawn-return-code-if-clone-fails-BZ-.patch
Patch136: backport-elf-Fix-use-after-free-in-ldconfig-BZ-26779.patch Patch136: backport-elf-Fix-use-after-free-in-ldconfig-BZ-26779.patch
Patch137: realpath-Avoid-overwriting-preexisting-error-CVE-2021-3998.patch Patch137: realpath-Avoid-overwriting-preexisting-error-CVE-2021-3998.patch
Patch138: Linux-Avoid-closing-1-on-failure-in-__closefrom_fall.patch
Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch
Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch
@ -1390,6 +1391,9 @@ fi
%endif %endif
%changelog %changelog
* Mon May 30 2022 QingqingLi <liqingqing3@huawei.com> - 2.34-83
- Linux: Avoid closing -1 on faiure in __closefrom_fallback
* Sat May 28 2022 QingqingLi <liqingqing3@huawei.com> - 2.34-82 * Sat May 28 2022 QingqingLi <liqingqing3@huawei.com> - 2.34-82
- realpath: Avoid overwriting preexisting error (CVE-2021-3998) - realpath: Avoid overwriting preexisting error (CVE-2021-3998)