diff options
| author | Chao Zhang <chao.b.zhang@intel.com> | 2013-06-06 00:39:41 +0000 |
|---|---|---|
| committer | czhang46 <czhang46@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-06-06 00:39:41 +0000 |
| commit | 443bd74473c7578d52677ec511b8c76c7120d96a (patch) | |
| tree | 1b1a3299a6b299cc307871565ad189b20134a4e2 | |
| parent | 5e2fd93720028aef4e54bbefdc0496a34147665e (diff) | |
| download | edk2-443bd74473c7578d52677ec511b8c76c7120d96a.zip edk2-443bd74473c7578d52677ec511b8c76c7120d96a.tar.gz edk2-443bd74473c7578d52677ec511b8c76c7120d96a.tar.bz2 | |
Fix overflow issue in TcgProtocol
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by : Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by : Dong Guo <guo.dong@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14396 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | SecurityPkg/Tcg/TcgDxe/TpmComm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/SecurityPkg/Tcg/TcgDxe/TpmComm.c b/SecurityPkg/Tcg/TcgDxe/TpmComm.c index c47794b..96732fa 100644 --- a/SecurityPkg/Tcg/TcgDxe/TpmComm.c +++ b/SecurityPkg/Tcg/TcgDxe/TpmComm.c @@ -1,7 +1,7 @@ /** @file
Utility functions used by TPM Dxe driver.
-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -144,10 +144,17 @@ TpmCommLogEvent ( IN UINT8 *NewEventData
)
{
- UINT32 NewLogSize;
+ UINTN NewLogSize;
+
+ //
+ // Prevent Event Overflow
+ //
+ if (NewEventHdr->EventSize > (UINTN)(~0) - sizeof (*NewEventHdr)) {
+ return EFI_OUT_OF_RESOURCES;
+ }
NewLogSize = sizeof (*NewEventHdr) + NewEventHdr->EventSize;
- if (NewLogSize + *LogSize > MaxSize) {
+ if (NewLogSize > MaxSize - *LogSize) {
return EFI_OUT_OF_RESOURCES;
}
|