[PATCH] SecurityPkg/TcgDxe: Refine to compare 2 values with the same type

[PATCH] SecurityPkg/TcgDxe: Refine to compare 2 values with the same type

[Hao Wu]

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index f7bf79a..5b7c5c3 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -8,7 +8,7 @@ buffer overflow, integer overflow.
 
 TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.
 
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD License 
@@ -395,7 +395,7 @@ TpmCommLogEvent (
   //
   // Prevent Event Overflow
   //
-  if (NewEventHdr->EventSize > (UINTN)(~0) - sizeof (*NewEventHdr)) {
+  if ((UINTN) NewEventHdr->EventSize > MAX_UINTN - sizeof (*NewEventHdr)) {
     return EFI_OUT_OF_RESOURCES;
   }
 
-- 
1.9.5.msysgit.0

Re: [PATCH] SecurityPkg/TcgDxe: Refine to compare 2 values with the same type

[Yao, Jiewen]

Reviewed-by:jiewen.yao@intel.com

> -----Original Message-----
> From: Wu, Hao A
> Sent: Friday, January 6, 2017 4:55 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>;
> Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH] SecurityPkg/TcgDxe: Refine to compare 2 values with the same
> type
> 
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> index f7bf79a..5b7c5c3 100644
> --- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> +++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> @@ -8,7 +8,7 @@ buffer overflow, integer overflow.
> 
>  TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.
> 
> -Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
>  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  This program and the accompanying materials
>  are licensed and made available under the terms and conditions of the BSD
> License
> @@ -395,7 +395,7 @@ TpmCommLogEvent (
>    //
>    // Prevent Event Overflow
>    //
> -  if (NewEventHdr->EventSize > (UINTN)(~0) - sizeof (*NewEventHdr)) {
> +  if ((UINTN) NewEventHdr->EventSize > MAX_UINTN - sizeof
> (*NewEventHdr)) {
>      return EFI_OUT_OF_RESOURCES;
>    }
> 
> --
> 1.9.5.msysgit.0