sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SecurityPkg: Use PcdSet##S to instead of PcdSet##

Browse Source 
PcdSet## has no error status returned, then the caller has no idea about whether the set operation is successful or not.
PcdSet##S were added to return error status and PcdSet## APIs were put in ifndef DISABLE_NEW_DEPRECATED_INTERFACES condition.
To adopt PcdSet##S and further code development with DISABLE_NEW_DEPRECATED_INTERFACES defined, we need to Replace PcdSet## usage with PcdSet##S.

Normally, DynamicDefault PCD set is expected to be success, but DynamicHii PCD set failure is a legal case.
PcdTpmInitializationPolicy/PcdTcg2HashAlgorithmBitmap/PcdTpm2HashMask/PcdTpmInstanceGuid all have set operation in PEI phase,
PEI phase does not allow DynamicHii PCD set, so DynamicDefault is expected for them and use PcdSet##S to instead of PcdSet## and assert when set failure.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18614 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng
2015-10-16 01:46:19 +00:00
committed by lzeng14
parent e90c57aa97
commit fe3ca12d06
7 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
View File

@ -205,6 +205,7 @@ RegisterHashInterfaceLib (
UINTN Index; UINTN Index;
UINT32 HashMask; UINT32 HashMask;
UINT32 BiosSupportedHashMask; UINT32 BiosSupportedHashMask;
EFI_STATUS Status;
// //
// Check allow // Check allow
@ -218,7 +219,8 @@ RegisterHashInterfaceLib (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
BiosSupportedHashMask = PcdGet32 (PcdTcg2HashAlgorithmBitmap); BiosSupportedHashMask = PcdGet32 (PcdTcg2HashAlgorithmBitmap);
PcdSet32 (PcdTcg2HashAlgorithmBitmap, BiosSupportedHashMask | HashMask); Status = PcdSet32S (PcdTcg2HashAlgorithmBitmap, BiosSupportedHashMask | HashMask);
ASSERT_EFI_ERROR (Status);
// //
// Check duplication // Check duplication

4
SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
View File

@ -258,6 +258,7 @@ RegisterHashInterfaceLib (
HASH_INTERFACE_HOB LocalHashInterfaceHob; HASH_INTERFACE_HOB LocalHashInterfaceHob;
UINT32 HashMask; UINT32 HashMask;
UINT32 BiosSupportedHashMask; UINT32 BiosSupportedHashMask;
EFI_STATUS Status;
// //
// Check allow // Check allow
@ -280,7 +281,8 @@ RegisterHashInterfaceLib (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
BiosSupportedHashMask = PcdGet32 (PcdTcg2HashAlgorithmBitmap); BiosSupportedHashMask = PcdGet32 (PcdTcg2HashAlgorithmBitmap);
PcdSet32 (PcdTcg2HashAlgorithmBitmap, BiosSupportedHashMask | HashMask); Status = PcdSet32S (PcdTcg2HashAlgorithmBitmap, BiosSupportedHashMask | HashMask);
ASSERT_EFI_ERROR (Status);
// //
// Check duplication // Check duplication

3
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
View File

@ -132,7 +132,8 @@ Tcg2ConfigPeimEntryPoint (
for (Index = 0; Index < sizeof(mTpmInstanceId)/sizeof(mTpmInstanceId[0]); Index++) { for (Index = 0; Index < sizeof(mTpmInstanceId)/sizeof(mTpmInstanceId[0]); Index++) {
if (TpmDevice == mTpmInstanceId[Index].TpmDevice) { if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {
Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid); Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);
PcdSetPtr (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid); Status = PcdSetPtrS (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid);
ASSERT_EFI_ERROR (Status);
DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid)); DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));
break; break;
} }

3
SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
View File

@ -124,6 +124,7 @@ DetectTpmDevice (
} }
// NO initialization needed again. // NO initialization needed again.
PcdSet8 (PcdTpmInitializationPolicy, 0); Status = PcdSet8S (PcdTpmInitializationPolicy, 0);
ASSERT_EFI_ERROR (Status);
return TPM_DEVICE_1_2; return TPM_DEVICE_1_2;
} }

3
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
View File

@ -410,7 +410,8 @@ SetTpm2HashMask (
} }
} }
} }
PcdSet32 (PcdTpm2HashMask, ActivePcrBanks); Status = PcdSet32S (PcdTpm2HashMask, ActivePcrBanks);
ASSERT_EFI_ERROR (Status);
} }
/** /**

5
SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
TPM1.2/dTPM2.0 auto detection. TPM1.2/dTPM2.0 auto detection.
Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -124,6 +124,7 @@ DetectTpmDevice (
} }
// NO initialization needed again. // NO initialization needed again.
PcdSet8 (PcdTpmInitializationPolicy, 0); Status = PcdSet8S (PcdTpmInitializationPolicy, 0);
ASSERT_EFI_ERROR (Status);
return TPM_DEVICE_1_2; return TPM_DEVICE_1_2;
} }

3
SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
View File

@ -132,7 +132,8 @@ TrEEConfigPeimEntryPoint (
for (Index = 0; Index < sizeof(mTpmInstanceId)/sizeof(mTpmInstanceId[0]); Index++) { for (Index = 0; Index < sizeof(mTpmInstanceId)/sizeof(mTpmInstanceId[0]); Index++) {
if (TpmDevice == mTpmInstanceId[Index].TpmDevice) { if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {
Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid); Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);
PcdSetPtr (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid); Status = PcdSetPtrS (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid);
ASSERT_EFI_ERROR (Status);
DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid)); DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));
break; break;
} }