From d4193108b51f5aae16805eaf753dfc9b6d7b15f2 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Mon, 28 Jul 2014 07:45:49 +0000 Subject: [PATCH] Update code to support VS2013 tool chain. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15694 6f19259b-4bc3-4df7-8a09-765794883524 --- SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 4 +++- SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c | 4 +++- .../VariableAuthenticated/RuntimeDxe/AuthService.c | 1 + SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c | 5 +++-- SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c | 1 + .../RuntimeDxe/VariableSmmRuntimeDxe.c | 8 +++++++- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c index 322d726037..df9700a4d9 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 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.
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 @@ -735,6 +735,8 @@ MeasureHandoffTables ( UINTN ProcessorNum; EFI_CPU_PHYSICAL_LOCATION *ProcessorLocBuf; + ProcessorLocBuf = NULL; + // // Measure SMBIOS with EV_EFI_HANDOFF_TABLES to PCR[1] // diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c index 9451b55c30..09f8a364ad 100644 --- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c +++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c @@ -1,7 +1,7 @@ /** @file This module implements TrEE Protocol. -Copyright (c) 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
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 @@ -1099,6 +1099,8 @@ MeasureHandoffTables ( UINTN ProcessorNum; EFI_CPU_PHYSICAL_LOCATION *ProcessorLocBuf; + ProcessorLocBuf = NULL; + // // Measure SMBIOS with EV_EFI_HANDOFF_TABLES to PCR[1] // diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c index 07a41b06f8..2663dbe063 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c @@ -2122,6 +2122,7 @@ VerifyTimeBasedPayload ( WrapSigData = NULL; SignerCerts = NULL; RootCert = NULL; + CertsInCertDb = NULL; // // When the attribute EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS is diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c index b20facd9d8..d79cd36b0d 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Reclaim.c @@ -2,7 +2,7 @@ Handles non-volatile variable store garbage collection, using FTW (Fault Tolerant Write) protocol. -Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
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 @@ -48,7 +48,8 @@ GetLbaAndOffsetByAddress ( *Lba = (EFI_LBA) (-1); *Offset = 0; - + Fvb = NULL; + // // Get the proper FVB protocol. // diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c index 6a33a78da4..6b9ca960b6 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c @@ -3881,6 +3881,7 @@ GetFvbInfoByAddress ( EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; EFI_FVB_ATTRIBUTES_2 Attributes; + HandleBuffer = NULL; // // Get all FVB handles. // diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c index f550c67bee..7f4380be42 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c @@ -13,7 +13,7 @@ InitCommunicateBuffer() is really function to check the variable data size. -Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
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 @@ -222,6 +222,7 @@ VariableLockRequestToLock ( } VariableNameSize = StrSize (VariableName); + VariableToLock = NULL; // // If VariableName exceeds SMM payload limit. Return failure @@ -302,6 +303,7 @@ RuntimeServiceGetVariable ( TempDataSize = *DataSize; VariableNameSize = StrSize (VariableName); + SmmVariableHeader = NULL; // // If VariableName exceeds SMM payload limit. Return failure @@ -404,6 +406,7 @@ RuntimeServiceGetNextVariableName ( OutVariableNameSize = *VariableNameSize; InVariableNameSize = StrSize (VariableName); + SmmGetNextVariableName = NULL; // // If input string exceeds SMM payload limit. Return failure @@ -523,6 +526,7 @@ RuntimeServiceSetVariable ( } VariableNameSize = StrSize (VariableName); + SmmVariableHeader = NULL; // // If VariableName or DataSize exceeds SMM payload limit. Return failure @@ -602,6 +606,8 @@ RuntimeServiceQueryVariableInfo ( UINTN PayloadSize; SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO *SmmQueryVariableInfo; + SmmQueryVariableInfo = NULL; + if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) { return EFI_INVALID_PARAMETER; } -- 2.39.2