diff options
| author | Star Zeng <star.zeng@intel.com> | 2015-10-16 01:46:19 +0000 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-03-03 14:12:18 +0800 |
| commit | 88e61ced4642aad305e7ff455616253b55e7d742 (patch) | |
| tree | 8c0f5942da9a5618c38d2323bfb85b2b6ef936cd /SecurityPkg/Tcg/Tcg2Config | |
| parent | ff24f60a1c06f1dc6b0f17007281aed032a66405 (diff) | |
| download | edk2-platforms-88e61ced4642aad305e7ff455616253b55e7d742.tar.xz | |
SecurityPkg: Use PcdSet##S to instead of PcdSet##
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
(cherry picked from commit fe3ca12d06a534e5f10587a52730f5fd43dab831)
Diffstat (limited to 'SecurityPkg/Tcg/Tcg2Config')
| -rw-r--r-- | SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 3 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/Tcg2Config/TpmDetection.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c index 34767c0f49..004c7efe70 100644 --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c @@ -132,7 +132,8 @@ Tcg2ConfigPeimEntryPoint ( for (Index = 0; Index < sizeof(mTpmInstanceId)/sizeof(mTpmInstanceId[0]); Index++) {
if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {
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));
break;
}
diff --git a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c index 9e93e9c2d9..33f3a21d87 100644 --- a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c +++ b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c @@ -124,6 +124,7 @@ DetectTpmDevice ( }
// NO initialization needed again.
- PcdSet8 (PcdTpmInitializationPolicy, 0);
+ Status = PcdSet8S (PcdTpmInitializationPolicy, 0);
+ ASSERT_EFI_ERROR (Status);
return TPM_DEVICE_1_2;
}
|