From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=qin.long@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 783892234432F for ; Thu, 18 Jan 2018 23:07:08 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2018 23:12:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,380,1511856000"; d="scan'208";a="196983948" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga006.fm.intel.com with ESMTP; 18 Jan 2018 23:12:30 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 18 Jan 2018 23:12:30 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0319.002; Fri, 19 Jan 2018 15:12:29 +0800 From: "Long, Qin" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Ye, Ting" Thread-Topic: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper Thread-Index: AQHTkPPs/ZoMlNIjQUmEovUbs4Frz6N6QSGAgACGLmA= Date: Fri, 19 Jan 2018 07:12:28 +0000 Message-ID: References: <20180119070506.5980-1-qin.long@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9FED1E@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B9FED1E@shsmsx102.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 07:07:08 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable It's legal to continue the calculation about the seconds elapsed since 1970= .01.01 00:00:00. -----Original Message----- From: Zeng, Star=20 Sent: Friday, January 19, 2018 3:10 PM To: Long, Qin ; edk2-devel@lists.01.org Cc: Ye, Ting ; Zeng, Star Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() = wrapper What will happen if Time.Year =3D=3D 1970? :) Thanks, Star -----Original Message----- From: Long, Qin Sent: Friday, January 19, 2018 3:05 PM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Ye, Ting ; Long, Q= in Subject: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrap= per In time() wrapper implementation, the gRT->GetTime() call may be not availa= ble. This patch adds the extra error handling to avoid the potential dead l= oop. Cc: Star Zeng Cc: Ting Ye Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long --- CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/Crypto= Pkg/Library/BaseCryptLib/SysCall/TimerWrapper.c index 581b8fb028..95e0419640 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c @@ -72,14 +72,18 @@ UINTN CumulativeDays[2][14] =3D { // ) time_t time (= time_t *timer) { - EFI_TIME Time; - time_t CalTime; - UINTN Year; + EFI_STATUS Status; + EFI_TIME Time; + time_t CalTime; + UINTN Year; =20 // // Get the current time and date information // - gRT->GetTime (&Time, NULL); + Status =3D gRT->GetTime (&Time, NULL); + if (EFI_ERROR (Status) || (Time.Year < 1970)) { + return 0; + } =20 // // Years Handling -- 2.15.1.windows.2