From nobody Fri May 17 20:47:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96884+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96884+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1669960321; cv=none; d=zohomail.com; s=zohoarc; b=UrBM73jNMcjnTn1Luttpyo0HXvGM868vkFkniTm/GjSSsdDzbCdP4MuWRWRh0JyymMuo6lcuu/+pX8dJ9zh6t6aYLNuuzHXomC6vXoXU0P2m3qf5vyuyLfZPF0oV+SWujpXeBksbxMn0CyrOKIXeUK3hUFRKRNI0TI1DyoL2zJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669960321; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=DqActntzMHJuD4ehsiAUiGXAKXxqBOB+P2fIOQQz09U=; b=jCMDnNQV5IUKZ5FSnQhd4jfx7KIp/a/GE2kwDSoYkcIVIFefy75uZ2g7eppy3Gk0OqxHaA2Iwz96/hn68cajW8ttU6Su0b7S/ZuF5CTTDomDW2dYCxdybIGSmaSv+eA82Z29TvsHoAfQP0inqpQFyCPMCPNWRX0oRdtSqUwGg7Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96884+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1669960321218886.0724534940085; Thu, 1 Dec 2022 21:52:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id MOGAYY1788612xb7p0zs7nkL; Thu, 01 Dec 2022 21:52:00 -0800 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web11.68359.1669960319496879651 for ; Thu, 01 Dec 2022 21:51:59 -0800 X-Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NNhmm0h9JzqShv for ; Fri, 2 Dec 2022 13:47:52 +0800 (CST) X-Received: from kwephisprg16640.huawei.com (10.247.83.252) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 2 Dec 2022 13:51:56 +0800 From: "wenyi,xie via groups.io" To: , , , , CC: , , Subject: [edk2-devel] [PATCH EDK2 v2 1/1] CryptoPkg/BaseCryptLib:time overflow Date: Fri, 2 Dec 2022 13:51:50 +0800 Message-ID: <20221202055150.1476640-2-xiewenyi2@huawei.com> In-Reply-To: <20221202055150.1476640-1-xiewenyi2@huawei.com> References: <20221202055150.1476640-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xiewenyi2@huawei.com X-Gm-Message-State: 0Mjq4zhezH4tYpW993r5JwKKx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669960320; bh=HEJRldJUWOxQ8iBLncSQQfe225Fkw7mXqHUnpr1iC8I=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=DTWqsAqBBZWPwNdmGPPGxy8n5fF/K+DpCuD62/EByrltnoGhmJJNpzxbxnFTMvFLpJj dkbOVdbnSJnnVg+7UkdcZg+ef/L1A+GBrrDFRm+RTSTDQwym6hURDRqC/4mR+u177POAu UyemVNdfcycAKOYXlOoTyM7MDgZXaueVbJY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669960322340100007 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zihong Yi REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4167 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 Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Zihong Yi --- CryptoPkg/Library/Include/CrtLibSupport.h | 2 +- CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c | 51 ++++++++++++++-= ----- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/= Include/CrtLibSupport.h index 5072c343da57..94b0e6b6014f 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -109,7 +109,7 @@ typedef UINTN off_t; typedef UINTN u_int; typedef INTN ptrdiff_t; typedef INTN ssize_t; -typedef INT32 time_t; +typedef INT64 time_t; typedef UINT8 __uint8_t; typedef UINT8 sa_family_t; typedef UINT8 u_char; diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/Crypto= Pkg/Library/BaseCryptLib/SysCall/TimerWrapper.c index bf8a5325817f..2dfc6fe6c593 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c @@ -15,7 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // -- Time Management Routines -- // =20 -#define IsLeap(y) (((y) % 4) =3D=3D 0 && (((y) % 100) !=3D 0 || ((y) % 40= 0) =3D=3D 0)) #define SECSPERMIN (60) #define SECSPERHOUR (60 * 60) #define SECSPERDAY (24 * SECSPERHOUR) @@ -60,6 +59,26 @@ UINTN CumulativeDays[2][14] =3D { } }; =20 +/* 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 =3D=3D 0 && (Remainder2 !=3D 0 || Remainder3 =3D=3D 0= )); +} + /* Get the system time as seconds elapsed since midnight, January 1, 1970.= */ // INTN time( // INTN *timer @@ -117,12 +136,13 @@ gmtime ( ) { struct tm *GmTime; - UINT16 DayNo; - UINT32 DayRemainder; + UINT64 DayNo; + UINT64 DayRemainder; time_t Year; time_t YearNo; - UINT16 TotalDays; - UINT16 MonthNo; + UINT32 TotalDays; + UINT32 MonthNo; + INT64 Remainder; =20 if (timer =3D=3D NULL) { return NULL; @@ -135,18 +155,21 @@ gmtime ( =20 ZeroMem ((VOID *)GmTime, (UINTN)sizeof (struct tm)); =20 - DayNo =3D (UINT16)(*timer / SECSPERDAY); - DayRemainder =3D (UINT32)(*timer % SECSPERDAY); + DayNo =3D (UINT64)DivS64x64Remainder (*timer, SECSPERDAY, &Remain= der); + DayRemainder =3D (UINT64)Remainder; =20 - GmTime->tm_sec =3D (int)(DayRemainder % SECSPERMIN); - GmTime->tm_min =3D (int)((DayRemainder % SECSPERHOUR) / SECSPERMIN); - GmTime->tm_hour =3D (int)(DayRemainder / SECSPERHOUR); - GmTime->tm_wday =3D (int)((DayNo + 4) % 7); + DivS64x64Remainder (DayRemainder, SECSPERMIN, &Remainder); + GmTime->tm_sec =3D (int)Remainder; + DivS64x64Remainder (DayRemainder, SECSPERHOUR, &Remainder); + GmTime->tm_min =3D (int)DivS64x64Remainder (Remainder, SECSPERMIN, NULL= ); + GmTime->tm_hour =3D (int)DivS64x64Remainder (DayRemainder, SECSPERHOUR, = NULL); + DivS64x64Remainder ((DayNo + 4), 7, &Remainder); + GmTime->tm_wday =3D (int)Remainder; =20 for (Year =3D 1970, YearNo =3D 0; DayNo > 0; Year++) { - TotalDays =3D (UINT16)(IsLeap (Year) ? 366 : 365); + TotalDays =3D (UINT32)(IsLeap (Year) ? 366 : 365); if (DayNo >=3D TotalDays) { - DayNo =3D (UINT16)(DayNo - TotalDays); + DayNo =3D (UINT64)(DayNo - TotalDays); YearNo++; } else { break; @@ -158,7 +181,7 @@ gmtime ( =20 for (MonthNo =3D 12; MonthNo > 1; MonthNo--) { if (DayNo >=3D CumulativeDays[IsLeap (Year)][MonthNo]) { - DayNo =3D (UINT16)(DayNo - (UINT16)(CumulativeDays[IsLeap (Year)][Mo= nthNo])); + DayNo =3D (UINT64)(DayNo - (UINT32)(CumulativeDays[IsLeap (Year)][Mo= nthNo])); break; } } --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96884): https://edk2.groups.io/g/devel/message/96884 Mute This Topic: https://groups.io/mt/95400943/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-