tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg/BaseCryptLib:time overflow 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4167

In CrtLibSupport.h, time_t is defined as INT32, and its maximum value
is 2147483647. That is, the corresponding maximum timestamp is
2038-01-19 11:14:07. Therefore, overflow occurs when the test time
exceeds 2038-01-19 11:14:07. So change the type of time_t to INT64 and
also change the type of variables in function gmtime which calculated
with time_t.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Zihong Yi <yizihong@huawei.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Zihong Yi 2022-12-02 13:51:50 +08:00 committed by mergify[bot]
parent 5d5be45bd1
commit 7de1c71dd2
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
View File

@ -15,7 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// -- Time Management Routines -- // -- Time Management Routines --
// //
#define IsLeap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
#define SECSPERMIN (60) #define SECSPERMIN (60)
#define SECSPERHOUR (60 * 60) #define SECSPERHOUR (60 * 60)
#define SECSPERDAY (24 * SECSPERHOUR) #define SECSPERDAY (24 * SECSPERHOUR)
@ -60,6 +59,26 @@ UINTN CumulativeDays[2][14] = {
} }
}; };
/* Check the year is leap or not. */
// BOOLEAN IsLeap(
// INTN timer
// )
BOOLEAN
IsLeap (
time_t timer
)
{
INT64 Remainder1;
INT64 Remainder2;
INT64 Remainder3;
DivS64x64Remainder (timer, 4, &Remainder1);
DivS64x64Remainder (timer, 100, &Remainder2);
DivS64x64Remainder (timer, 400, &Remainder3);
return (Remainder1 == 0 && (Remainder2 != 0 || Remainder3 == 0));
}
/* Get the system time as seconds elapsed since midnight, January 1, 1970. */ /* Get the system time as seconds elapsed since midnight, January 1, 1970. */
// INTN time( // INTN time(
// INTN *timer // INTN *timer
@ -117,12 +136,13 @@ gmtime (
) )
{ {
struct tm *GmTime; struct tm *GmTime;
UINT16 DayNo; UINT64 DayNo;
UINT32 DayRemainder; UINT64 DayRemainder;
time_t Year; time_t Year;
time_t YearNo; time_t YearNo;
UINT16 TotalDays; UINT32 TotalDays;
UINT16 MonthNo; UINT32 MonthNo;
INT64 Remainder;
if (timer == NULL) { if (timer == NULL) {
return NULL; return NULL;
@ -135,18 +155,21 @@ gmtime (
ZeroMem ((VOID *)GmTime, (UINTN)sizeof (struct tm)); ZeroMem ((VOID *)GmTime, (UINTN)sizeof (struct tm));
DayNo = (UINT16)(*timer / SECSPERDAY); DayNo = (UINT64)DivS64x64Remainder (*timer, SECSPERDAY, &Remainder);
DayRemainder = (UINT32)(*timer % SECSPERDAY); DayRemainder = (UINT64)Remainder;
GmTime->tm_sec = (int)(DayRemainder % SECSPERMIN); DivS64x64Remainder (DayRemainder, SECSPERMIN, &Remainder);
GmTime->tm_min = (int)((DayRemainder % SECSPERHOUR) / SECSPERMIN); GmTime->tm_sec = (int)Remainder;
GmTime->tm_hour = (int)(DayRemainder / SECSPERHOUR); DivS64x64Remainder (DayRemainder, SECSPERHOUR, &Remainder);
GmTime->tm_wday = (int)((DayNo + 4) % 7); GmTime->tm_min = (int)DivS64x64Remainder (Remainder, SECSPERMIN, NULL);
GmTime->tm_hour = (int)DivS64x64Remainder (DayRemainder, SECSPERHOUR, NULL);
DivS64x64Remainder ((DayNo + 4), 7, &Remainder);
GmTime->tm_wday = (int)Remainder;
for (Year = 1970, YearNo = 0; DayNo > 0; Year++) { for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {
TotalDays = (UINT16)(IsLeap (Year) ? 366 : 365); TotalDays = (UINT32)(IsLeap (Year) ? 366 : 365);
if (DayNo >= TotalDays) { if (DayNo >= TotalDays) {
DayNo = (UINT16)(DayNo - TotalDays); DayNo = (UINT64)(DayNo - TotalDays);
YearNo++; YearNo++;
} else { } else {
break; break;
@ -158,7 +181,7 @@ gmtime (
for (MonthNo = 12; MonthNo > 1; MonthNo--) { for (MonthNo = 12; MonthNo > 1; MonthNo--) {
if (DayNo >= CumulativeDays[IsLeap (Year)][MonthNo]) { if (DayNo >= CumulativeDays[IsLeap (Year)][MonthNo]) {
DayNo = (UINT16)(DayNo - (UINT16)(CumulativeDays[IsLeap (Year)][MonthNo])); DayNo = (UINT64)(DayNo - (UINT32)(CumulativeDays[IsLeap (Year)][MonthNo]));
break; break;
} }
} }

2
CryptoPkg/Library/Include/CrtLibSupport.h
View File

@ -109,7 +109,7 @@ typedef UINTN off_t;
typedef UINTN u_int; typedef UINTN u_int;
typedef INTN ptrdiff_t; typedef INTN ptrdiff_t;
typedef INTN ssize_t; typedef INTN ssize_t;
typedef INT32 time_t; typedef INT64 time_t;
typedef UINT8 __uint8_t; typedef UINT8 __uint8_t;
typedef UINT8 sa_family_t; typedef UINT8 sa_family_t;
typedef UINT8 u_char; typedef UINT8 u_char;