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

!639 [sync] PR-637: time: Fix use-after-free in getdate

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
This commit is contained in:
openeuler-ci-bot 2023-07-17 01:49:35 +00:00 committed by Gitee
commit 88fa0f4754
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc.spec
View File

@ -70,7 +70,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 126 Release: 127
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/
@ -271,6 +271,7 @@ Patch180: backport-localedata-Adjust-C.UTF-8-to-align-with-C-POSIX.patch
Patch181: backport-elf-Make-more-functions-available-for-binding-during.patch Patch181: backport-elf-Make-more-functions-available-for-binding-during.patch
Patch182: backport-elf-fix-handling-of-negative-numbers-in-dl-printf.patch Patch182: backport-elf-fix-handling-of-negative-numbers-in-dl-printf.patch
Patch183: backport-rtld-properly-handle-root-directory-in-load-path-bug-30435.patch Patch183: backport-rtld-properly-handle-root-directory-in-load-path-bug-30435.patch
Patch184: time-Fix-use-after-free-in-getdate.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
@ -1486,6 +1487,9 @@ fi
%endif %endif
%changelog %changelog
* Sun Jul 16 2023 Qingqing Li <liqingqing3@huawei.com> - 2.34-127
- time: Fix use-after-free in getdate
* Tue Jul 11 2023 lijianglin<lijianglin2@huawei.com> - 2.34-126 * Tue Jul 11 2023 lijianglin<lijianglin2@huawei.com> - 2.34-126
- add the test of the entire GB18030 charmap - add the test of the entire GB18030 charmap

48
time-Fix-use-after-free-in-getdate.patch Normal file
View File

@ -0,0 +1,48 @@
From 85e6d8b4175fcb195011a0a1bad37d6f3b2355db Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun@redhat.com>
Date: Tue, 6 Jun 2023 19:20:31 +0200
Subject: [PATCH] time: Fix use-after-free in getdate
getdate would free the buffer pointed to by the result of its call to
strptime, then reference the same buffer later on -- leading to a
use-after-free. This commit fixes that.
Reported-by: Martin Coufal <mcoufal@redhat.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
time/getdate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/time/getdate.c b/time/getdate.c
index 1dcbd77188..ca058394a3 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -114,6 +114,7 @@ __getdate_r (const char *string, struct tm *tp)
struct tm tm;
struct __stat64_t64 st;
bool mday_ok = false;
+ bool found = false;
datemsk = getenv ("DATEMSK");
if (datemsk == NULL || *datemsk == '\0')
@@ -181,7 +182,7 @@ __getdate_r (const char *string, struct tm *tp)
tp->tm_gmtoff = 0;
tp->tm_zone = NULL;
result = strptime (string, line, tp);
- if (result && *result == '\0')
+ if ((found = (result && *result == '\0')))
break;
}
while (!__feof_unlocked (fp));
@@ -201,7 +202,7 @@ __getdate_r (const char *string, struct tm *tp)
/* Close template file. */
fclose (fp);
- if (result == NULL || *result != '\0')
+ if (!found)
return 7;
/* Get current time. */
--
2.33.0