diff options
| author | Jiaxin Wu <Jiaxin.wu@intel.com> | 2018-10-16 13:34:00 +0800 |
|---|---|---|
| committer | Jiaxin Wu <Jiaxin.wu@intel.com> | 2018-10-22 09:04:56 +0800 |
| commit | ddc6d41d128c57dec8e79a0ad1eae7a80ec0280b (patch) | |
| tree | ccf5e5305eb4e87bbcb01c2e6efd2ca71a9457ab | |
| parent | 1682cc9353ecf688aa928fa102280c1d807ba3c5 (diff) | |
| download | edk2-ddc6d41d128c57dec8e79a0ad1eae7a80ec0280b.tar.gz edk2-ddc6d41d128c57dec8e79a0ad1eae7a80ec0280b.tar.bz2 edk2-ddc6d41d128c57dec8e79a0ad1eae7a80ec0280b.zip | |
NetworkPkg: Correct the time stamp and fix the integer overflow issue.
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=883.
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
| -rw-r--r-- | NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 18 | ||||
| -rw-r--r-- | 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 @@ -123,7 +123,7 @@ Dhcp6GenerateClientId ( gRT->GetTime (&Time, 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
);
@@ -881,14 +881,14 @@ SetElapsedTime ( // Generate a time stamp of the centiseconds from 2000/1/1, assume 30day/month.
//
gRT->GetTime (&Time, 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, 10000000)
- );
+ 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,
+ 10000000
+ );
//
// Sentinel value of 0 means that this is the first DHCP packet that we are
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 @@ -1510,14 +1510,14 @@ CalcElapsedTime ( //
ZeroMem (&Time, sizeof (EFI_TIME));
gRT->GetTime (&Time, 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, 10000000)
- );
+ 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,
+ 10000000
+ );
//
// Sentinel value of 0 means that this is the first DHCP packet that we are
|