From ab187ae25a7cc230af32a540ca14737bd93d9665 Mon Sep 17 00:00:00 2001 From: Long Qin Date: Mon, 22 Jan 2018 14:27:53 +0800 Subject: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper In time() wrapper implementation, the gRT->GetTime() call may be not available. This patch adds the extra error handling to avoid the potential dead loop. Cc: Star Zeng Cc: Ting Ye Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long Reviewed-by: Star Zeng --- .../Library/BaseCryptLib/SysCall/TimerWrapper.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c index 581b8fb028..cdf3b60b9f 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c @@ -2,7 +2,7 @@ C Run-Time Libraries (CRT) Time Management Routines Wrapper Implementation for OpenSSL-based Cryptographic Library (used in DXE & RUNTIME). -Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -72,14 +72,18 @@ UINTN CumulativeDays[2][14] = { // ) 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; // // Get the current time and date information // - gRT->GetTime (&Time, NULL); + Status = gRT->GetTime (&Time, NULL); + if (EFI_ERROR (Status) || (Time.Year < 1970)) { + return 0; + } // // Years Handling -- 2.39.2