1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper

Long Qin posted 1 patch 6 years, 2 months ago
Failed in applying to current master (apply log)
CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
[edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Long Qin 6 years, 2 months ago 
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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Zeng, Star 6 years, 2 months ago 
What will happen if Time.Year == 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 <star.zeng@intel.com>; Ye, Ting <ting.ye@intel.com>; Long, Qin <qin.long@intel.com>
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 <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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Long, Qin 6 years, 2 months ago 
It's legal to continue the calculation about the seconds elapsed since 1970.01.01 00:00:00.


-----Original Message-----
From: Zeng, Star 
Sent: Friday, January 19, 2018 3:10 PM
To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper

What will happen if Time.Year == 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 <star.zeng@intel.com>; Ye, Ting <ting.ye@intel.com>; Long, Qin <qin.long@intel.com>
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 <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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Zeng, Star 6 years, 2 months ago 
Ok, got it.

Reviewed-by: Star Zeng <star.zeng@intel.com>

Thanks,
Star
-----Original Message-----
From: Long, Qin 
Sent: Friday, January 19, 2018 3:12 PM
To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>
Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper

It's legal to continue the calculation about the seconds elapsed since 1970.01.01 00:00:00.


-----Original Message-----
From: Zeng, Star 
Sent: Friday, January 19, 2018 3:10 PM
To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper

What will happen if Time.Year == 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 <star.zeng@intel.com>; Ye, Ting <ting.ye@intel.com>; Long, Qin <qin.long@intel.com>
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 <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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Ni, Ruiyu 6 years, 2 months ago 
Qin,
How about add more comments to say the tick is calculated from 1970 first second?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Zeng, Star
> Sent: Friday, January 19, 2018 3:14 PM
> To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for
> time() wrapper
> 
> Ok, got it.
> 
> Reviewed-by: Star Zeng <star.zeng@intel.com>
> 
> Thanks,
> Star
> -----Original Message-----
> From: Long, Qin
> Sent: Friday, January 19, 2018 3:12 PM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time()
> wrapper
> 
> It's legal to continue the calculation about the seconds elapsed since
> 1970.01.01 00:00:00.
> 
> 
> -----Original Message-----
> From: Zeng, Star
> Sent: Friday, January 19, 2018 3:10 PM
> To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time()
> wrapper
> 
> What will happen if Time.Year == 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 <star.zeng@intel.com>; Ye, Ting <ting.ye@intel.com>; Long,
> Qin <qin.long@intel.com>
> 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 <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
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper
Posted by Long, Qin 6 years, 2 months ago 
Yes, and the function comment were already there.


-----Original Message-----
From: Ni, Ruiyu 
Sent: Friday, January 19, 2018 3:16 PM
To: Zeng, Star <star.zeng@intel.com>; Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for time() wrapper

Qin,
How about add more comments to say the tick is calculated from 1970 first second?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of 
> Zeng, Star
> Sent: Friday, January 19, 2018 3:14 PM
> To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: Re: [edk2] [PATCH] CryptoPkg/BaseCryptLib: Add error handling 
> for
> time() wrapper
> 
> Ok, got it.
> 
> Reviewed-by: Star Zeng <star.zeng@intel.com>
> 
> Thanks,
> Star
> -----Original Message-----
> From: Long, Qin
> Sent: Friday, January 19, 2018 3:12 PM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for 
> time() wrapper
> 
> It's legal to continue the calculation about the seconds elapsed since
> 1970.01.01 00:00:00.
> 
> 
> -----Original Message-----
> From: Zeng, Star
> Sent: Friday, January 19, 2018 3:10 PM
> To: Long, Qin <qin.long@intel.com>; edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] CryptoPkg/BaseCryptLib: Add error handling for 
> time() wrapper
> 
> What will happen if Time.Year == 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 <star.zeng@intel.com>; Ye, Ting <ting.ye@intel.com>; 
> Long, Qin <qin.long@intel.com>
> 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 <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
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.