Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction() and Tcg2PhysicalPresenceLibGetUserConfirmationStatusFunction()\r
will receive untrusted input and do validation.\r
\r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
#include <Protocol/SmmVariable.h>\r
\r
#include <Library/DebugLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
#include <Library/Tcg2PpVendorLib.h>\r
#include <Library/SmmServicesTableLib.h>\r
\r
This API should be invoked in OS runtime phase to interface with ACPI method.\r
\r
Caution: This function may receive untrusted input.\r
- \r
- @param[in] OperationRequest TPM physical presence operation request.\r
- @param[in] RequestParameter TPM physical presence operation request parameter.\r
+\r
+ @param[in, out] Pointer to OperationRequest TPM physical presence operation request.\r
+ @param[in, out] Pointer to RequestParameter TPM physical presence operation request parameter.\r
\r
@return Return Code for Submit TPM Operation Request to Pre-OS Environment and\r
- Submit TPM Operation Request to Pre-OS Environment 2.\r
-**/\r
+ Submit TPM Operation Request to Pre-OS Environment 2.\r
+ **/\r
UINT32\r
-EFIAPI\r
-Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (\r
- IN UINT32 OperationRequest,\r
- IN UINT32 RequestParameter\r
+Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunctionEx (\r
+ IN OUT UINT32 *OperationRequest,\r
+ IN OUT UINT32 *RequestParameter\r
)\r
{\r
EFI_STATUS Status;\r
+ UINT32 ReturnCode;\r
UINTN DataSize;\r
EFI_TCG2_PHYSICAL_PRESENCE PpData;\r
EFI_TCG2_PHYSICAL_PRESENCE_FLAGS Flags;\r
\r
- DEBUG ((EFI_D_INFO, "[TPM2] SubmitRequestToPreOSFunction, Request = %x, %x\n", OperationRequest, RequestParameter));\r
+ DEBUG ((EFI_D_INFO, "[TPM2] SubmitRequestToPreOSFunction, Request = %x, %x\n", *OperationRequest, *RequestParameter));\r
+ ReturnCode = TCG_PP_SUBMIT_REQUEST_TO_PREOS_SUCCESS;\r
\r
//\r
// Get the Physical Presence variable\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "[TPM2] Get PP variable failure! Status = %r\n", Status));\r
- return TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;\r
+ ReturnCode = TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;\r
+ goto EXIT;\r
}\r
\r
- if ((OperationRequest > TCG2_PHYSICAL_PRESENCE_NO_ACTION_MAX) &&\r
- (OperationRequest < TCG2_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) ) {\r
- //\r
- // This command requires UI to prompt user for Auth data.\r
- //\r
- return TCG_PP_SUBMIT_REQUEST_TO_PREOS_NOT_IMPLEMENTED;\r
+ if ((*OperationRequest > TCG2_PHYSICAL_PRESENCE_NO_ACTION_MAX) &&\r
+ (*OperationRequest < TCG2_PHYSICAL_PRESENCE_STORAGE_MANAGEMENT_BEGIN) ) {\r
+ ReturnCode = TCG_PP_SUBMIT_REQUEST_TO_PREOS_NOT_IMPLEMENTED;\r
+ goto EXIT;\r
}\r
\r
- if (PpData.PPRequest != OperationRequest) {\r
- PpData.PPRequest = (UINT8)OperationRequest;\r
- PpData.PPRequestParameter = RequestParameter;\r
+ if ((PpData.PPRequest != *OperationRequest) ||\r
+ (PpData.PPRequestParameter != *RequestParameter)) {\r
+ PpData.PPRequest = (UINT8)*OperationRequest;\r
+ PpData.PPRequestParameter = *RequestParameter;\r
DataSize = sizeof (EFI_TCG2_PHYSICAL_PRESENCE);\r
Status = mTcg2PpSmmVariable->SmmSetVariable (\r
TCG2_PHYSICAL_PRESENCE_VARIABLE,\r
DataSize,\r
&PpData\r
);\r
+ if (EFI_ERROR (Status)) { \r
+ DEBUG ((EFI_D_ERROR, "[TPM2] Set PP variable failure! Status = %r\n", Status));\r
+ ReturnCode = TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;\r
+ goto EXIT;\r
+ }\r
}\r
\r
- if (EFI_ERROR (Status)) { \r
- DEBUG ((EFI_D_ERROR, "[TPM2] Set PP variable failure! Status = %r\n", Status));\r
- return TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;\r
- }\r
-\r
- if (OperationRequest >= TCG2_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
+ if (*OperationRequest >= TCG2_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
DataSize = sizeof (EFI_TCG2_PHYSICAL_PRESENCE_FLAGS);\r
Status = mTcg2PpSmmVariable->SmmGetVariable (\r
TCG2_PHYSICAL_PRESENCE_FLAGS_VARIABLE,\r
&Flags\r
);\r
if (EFI_ERROR (Status)) {\r
- Flags.PPFlags = TCG2_BIOS_TPM_MANAGEMENT_FLAG_DEFAULT;\r
+ Flags.PPFlags = TCG2_BIOS_TPM_MANAGEMENT_FLAG_DEFAULT | TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_DEFAULT;\r
}\r
- return Tcg2PpVendorLibSubmitRequestToPreOSFunction (OperationRequest, Flags.PPFlags, RequestParameter);\r
+ ReturnCode = Tcg2PpVendorLibSubmitRequestToPreOSFunction (*OperationRequest, Flags.PPFlags, *RequestParameter);\r
}\r
\r
- return TCG_PP_SUBMIT_REQUEST_TO_PREOS_SUCCESS;\r
+EXIT:\r
+ //\r
+ // Sync PPRQ/PPRM from PP Variable if PP submission fails\r
+ //\r
+ if (ReturnCode != TCG_PP_SUBMIT_REQUEST_TO_PREOS_SUCCESS) {\r
+ DEBUG ((EFI_D_ERROR, "[TPM2] Submit PP Request failure! Sync PPRQ/PPRM with PP variable.\n", Status));\r
+ DataSize = sizeof (EFI_TCG2_PHYSICAL_PRESENCE);\r
+ ZeroMem(&PpData, DataSize);\r
+ Status = mTcg2PpSmmVariable->SmmGetVariable (\r
+ TCG2_PHYSICAL_PRESENCE_VARIABLE,\r
+ &gEfiTcg2PhysicalPresenceGuid,\r
+ NULL,\r
+ &DataSize,\r
+ &PpData\r
+ );\r
+ *OperationRequest = (UINT32)PpData.PPRequest;\r
+ *RequestParameter = PpData.PPRequestParameter;\r
+ }\r
+\r
+ return ReturnCode;\r
+}\r
+\r
+/**\r
+ The handler for TPM physical presence function:\r
+ Submit TPM Operation Request to Pre-OS Environment and\r
+ Submit TPM Operation Request to Pre-OS Environment 2.\r
+\r
+ This API should be invoked in OS runtime phase to interface with ACPI method.\r
+\r
+ Caution: This function may receive untrusted input.\r
+ \r
+ @param[in] OperationRequest TPM physical presence operation request.\r
+ @param[in] RequestParameter TPM physical presence operation request parameter.\r
+\r
+ @return Return Code for Submit TPM Operation Request to Pre-OS Environment and\r
+ Submit TPM Operation Request to Pre-OS Environment 2.\r
+**/\r
+UINT32\r
+EFIAPI\r
+Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (\r
+ IN UINT32 OperationRequest,\r
+ IN UINT32 RequestParameter\r
+ )\r
+{\r
+ UINT32 TempOperationRequest;\r
+ UINT32 TempRequestParameter;\r
+\r
+ TempOperationRequest = OperationRequest;\r
+ TempRequestParameter = RequestParameter;\r
+\r
+ return Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunctionEx(&TempOperationRequest, &TempRequestParameter);\r
}\r
\r
/**\r
}\r
break;\r
\r
+ case TCG2_PHYSICAL_PRESENCE_NO_ACTION:\r
case TCG2_PHYSICAL_PRESENCE_SET_PP_REQUIRED_FOR_CLEAR_TRUE:\r
RequestConfirmed = TRUE;\r
break;\r
RequestConfirmed = TRUE;\r
break;\r
\r
- default:\r
- if (OperationRequest <= TCG2_PHYSICAL_PRESENCE_NO_ACTION_MAX) {\r
+ case TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID:\r
+ if ((Flags.PPFlags & TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_PP_REQUIRED_FOR_ENABLE_BLOCK_SID) == 0) {\r
+ RequestConfirmed = TRUE;\r
+ }\r
+ break;\r
+\r
+ case TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID:\r
+ if ((Flags.PPFlags & TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_PP_REQUIRED_FOR_DISABLE_BLOCK_SID) == 0) {\r
RequestConfirmed = TRUE;\r
- } else {\r
- if (OperationRequest < TCG2_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
- return TCG_PP_GET_USER_CONFIRMATION_NOT_IMPLEMENTED;\r
- }\r
+ }\r
+ break;\r
+\r
+ case TCG2_PHYSICAL_PRESENCE_SET_PP_REQUIRED_FOR_ENABLE_BLOCK_SID_FUNC_TRUE:\r
+ case TCG2_PHYSICAL_PRESENCE_SET_PP_REQUIRED_FOR_DISABLE_BLOCK_SID_FUNC_TRUE:\r
+ RequestConfirmed = TRUE;\r
+ break;\r
+\r
+ case TCG2_PHYSICAL_PRESENCE_SET_PP_REQUIRED_FOR_ENABLE_BLOCK_SID_FUNC_FALSE:\r
+ case TCG2_PHYSICAL_PRESENCE_SET_PP_REQUIRED_FOR_DISABLE_BLOCK_SID_FUNC_FALSE:\r
+ break;\r
+\r
+ default:\r
+ if (OperationRequest < TCG2_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
+ //\r
+ // TCG PP spec defined operations that are reserved or un-implemented\r
+ //\r
+ return TCG_PP_GET_USER_CONFIRMATION_NOT_IMPLEMENTED;\r
}\r
break;\r
}\r
}\r
\r
/**\r
- The constructor function register UNI strings into imageHandle.\r
+ The constructor function locates SmmVariable protocol.\r
\r
It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. \r
\r
projects / mirror_edk2.git / blobdiff