public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
@ 2018-01-19  7:05 Long Qin
  2018-01-19  7:10 ` Zeng, Star
  0 siblings, 1 reply; 6+ messages in thread
From: Long Qin @ 2018-01-19  7:05 UTC (permalink / raw)
  To: edk2-devel; +Cc: star.zeng, ting.ye, Qin Long

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 <star.zeng@intel.com>
Cc: Ting Ye <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
---
 CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/CryptoPkg/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] = {
 //  )
 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.15.1.windows.2



^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-01-19  7:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-19  7:05 [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper Long Qin
2018-01-19  7:10 ` Zeng, Star
2018-01-19  7:12   ` Long, Qin
2018-01-19  7:14     ` Zeng, Star
2018-01-19  7:15       ` Ni, Ruiyu
2018-01-19  7:21         ` Long, Qin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox