Reviewed-by: Ye Ting
-Original Message-
From: Wu, Jiaxin
Sent: Tuesday, October 16, 2018 1:36 PM
To: edk2-devel@lists.01.org
Cc: Fu, Siyuan ; Ye, Ting ; Wu, Jiaxin
Subject: [Patch] NetworkPkg: Correct the time stamp and fix the integer
overflow issue.
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=883.
Cc: Fu Siyuan
Cc: Ye Ting
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin
---
NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 18 +-
NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 16
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index 10a99a00d4..9c7459c332 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -121,11 +121,11 @@ Dhcp6GenerateClientId (
// Generate a time stamp of the seconds from 2000/1/1, assume 30day/month.
//
gRT->GetTime (, NULL);
Stamp = (UINT32)
(
-(Time.Year - 2000) * 360 + (Time.Month - 1)) * 30 + (Time.Day -
1)) * 24 + Time.Hour) * 60 + Time.Minute) *
+UINT32)(Time.Year - 2000) * 360 + (Time.Month - 1) * 30 +
(Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) *
60 +
Time.Second
);
//
@@ -879,18 +879,18 @@ SetElapsedTime (
//
// Generate a time stamp of the centiseconds from 2000/1/1, assume
30day/month.
//
gRT->GetTime (, NULL);
- CurrentStamp = (UINT64)
-(
- ((Time.Year - 2000) * 360 +
- (Time.Month - 1)) * 30 +
- (Time.Day - 1)) * 24 + Time.Hour) * 60 +
- Time.Minute) * 60 + Time.Second) * 100
- + DivU64x32(Time.Nanosecond, 1000)
-);
+ CurrentStamp = MultU64x32 (
+ UINT32)(Time.Year - 2000) * 360 + (Time.Month - 1) * 30
+ (Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) * 60 + Time.Second,
+ 100
+ ) +
+ DivU64x32(
+ Time.Nanosecond,
+ 1000
+ );
//
// Sentinel value of 0 means that this is the first DHCP packet that we are
// sending and that we need to initialize the value. First DHCP message
// gets 0 elapsed-time. Otherwise, calculate based on StartTime.
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
index 60509fc9e6..7ab09e0367 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
@@ -1508,18 +1508,18 @@ CalcElapsedTime (
//
// Generate a time stamp of the centiseconds from 1900/1/1, assume
30day/month.
//
ZeroMem (, sizeof (EFI_TIME));
gRT->GetTime (, NULL);
- CurrentStamp = (UINT64)
-(
- ((Time.Year - 1900) * 360 +
- (Time.Month - 1)) * 30 +
- (Time.Day - 1)) * 24 + Time.Hour) * 60 +
- Time.Minute) * 60 + Time.Second) * 100
- + DivU64x32(Time.Nanosecond, 1000)
-);
+ CurrentStamp = MultU64x32 (
+ UINT32)(Time.Year - 1900) * 360 + (Time.Month - 1) * 30
+ (Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) * 60 + Time.Second,
+ 100
+ ) +
+ DivU64x32 (
+ Time.Nanosecond,
+ 1000
+ );
//
// Sentinel value of 0 means that this is the first DHCP packet that we are
// sending and that we need to initialize the value. First DHCP Solicit
// gets 0 elapsed-time. Otherwise, calculate based on StartTime.
--
2.17.1.windows.2
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
