\r
ExecutePendingTpmRequest() will receive untrusted input and do validation.\r
\r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, 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 <Library/HiiLib.h>\r
#include <Guid/EventGroup.h>\r
#include <Guid/PhysicalPresenceData.h>\r
+#include <Library/TcgPpVendorLib.h>\r
\r
-#define TPM_PP_USER_ABORT ((TPM_RESULT)(-0x10))\r
-#define TPM_PP_BIOS_FAILURE ((TPM_RESULT)(-0x0f))\r
#define CONFIRM_BUFFER_SIZE 4096\r
\r
EFI_HII_HANDLE mPpStringPackHandle;\r
@param[in] AdditionalParameterSize Additional parameter size. \r
@param[in] AdditionalParameters Pointer to the Additional paramaters. \r
\r
- @retval TPM_PP_BIOS_FAILURE Error occurred during sending command to TPM or \r
- receiving response from TPM.\r
- @retval Others Return code from the TPM device after command execution.\r
+ @retval TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE Error occurred during sending command to TPM or \r
+ receiving response from TPM.\r
+ @retval Others Return code from the TPM device after command execution.\r
\r
**/\r
-TPM_RESULT\r
+UINT32\r
TpmCommandNoReturnData (\r
IN EFI_TCG_PROTOCOL *TcgProtocol,\r
IN TPM_COMMAND_CODE Ordinal,\r
\r
TpmRqu = (TPM_RQU_COMMAND_HDR*) AllocatePool (sizeof (*TpmRqu) + AdditionalParameterSize);\r
if (TpmRqu == NULL) {\r
- return TPM_PP_BIOS_FAILURE;\r
+ return TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
}\r
\r
TpmRqu->tag = SwapBytes16 (TPM_TAG_RQU_COMMAND);\r
);\r
FreePool (TpmRqu);\r
if (EFI_ERROR (Status) || (TpmRsp.tag != SwapBytes16 (TPM_TAG_RSP_COMMAND))) {\r
- return TPM_PP_BIOS_FAILURE;\r
+ return TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
}\r
return SwapBytes32 (TpmRsp.returnCode);\r
}\r
@param[in] CommandCode Physical presence operation value.\r
@param[in, out] PpiFlags The physical presence interface flags.\r
\r
- @retval TPM_PP_BIOS_FAILURE Unknown physical presence operation.\r
- @retval TPM_PP_BIOS_FAILURE Error occurred during sending command to TPM or \r
- receiving response from TPM.\r
- @retval Others Return code from the TPM device after command execution.\r
+ @retval TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE Unknown physical presence operation.\r
+ @retval TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE Error occurred during sending command to TPM or \r
+ receiving response from TPM.\r
+ @retval Others Return code from the TPM device after command execution.\r
\r
**/\r
-TPM_RESULT\r
+UINT32\r
ExecutePhysicalPresence (\r
- IN EFI_TCG_PROTOCOL *TcgProtocol,\r
- IN UINT8 CommandCode,\r
- IN OUT UINT8 *PpiFlags\r
+ IN EFI_TCG_PROTOCOL *TcgProtocol,\r
+ IN UINT32 CommandCode,\r
+ IN OUT EFI_PHYSICAL_PRESENCE_FLAGS *PpiFlags\r
)\r
{\r
BOOLEAN BoolVal;\r
- TPM_RESULT TpmResponse;\r
+ UINT32 TpmResponse;\r
UINT32 InData[5];\r
\r
switch (CommandCode) {\r
// PHYSICAL_PRESENCE_ENABLE_ACTIVATE + PHYSICAL_PRESENCE_SET_OWNER_INSTALL_TRUE\r
// PHYSICAL_PRESENCE_SET_OWNER_INSTALL_TRUE will be executed after reboot\r
//\r
- if ((*PpiFlags & FLAG_RESET_TRACK) == 0) {\r
+ if ((PpiFlags->PPFlags & TCG_VENDOR_LIB_FLAG_RESET_TRACK) == 0) {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_ENABLE_ACTIVATE, PpiFlags);\r
- *PpiFlags |= FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags |= TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
} else {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_SET_OWNER_INSTALL_TRUE, PpiFlags);\r
- *PpiFlags &= ~FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags &= ~TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
}\r
return TpmResponse;\r
\r
// This command requires UI to prompt user for Auth data\r
// Here it is NOT implemented\r
//\r
- return TPM_PP_BIOS_FAILURE;\r
+ return TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
\r
case PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE:\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_CLEAR, PpiFlags);\r
return TpmResponse;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_PROVISION_FALSE:\r
- *PpiFlags &= ~FLAG_NO_PPI_PROVISION;\r
+ PpiFlags->PPFlags &= ~TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_PROVISION;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_PROVISION_TRUE:\r
- *PpiFlags |= FLAG_NO_PPI_PROVISION;\r
+ PpiFlags->PPFlags |= TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_PROVISION;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_CLEAR_FALSE:\r
- *PpiFlags &= ~FLAG_NO_PPI_CLEAR;\r
+ PpiFlags->PPFlags &= ~TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_CLEAR;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_CLEAR_TRUE:\r
- *PpiFlags |= FLAG_NO_PPI_CLEAR;\r
+ PpiFlags->PPFlags |= TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_CLEAR;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_MAINTENANCE_FALSE:\r
- *PpiFlags &= ~FLAG_NO_PPI_MAINTENANCE;\r
+ PpiFlags->PPFlags &= ~TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_MAINTENANCE;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_SET_NO_PPI_MAINTENANCE_TRUE:\r
- *PpiFlags |= FLAG_NO_PPI_MAINTENANCE;\r
+ PpiFlags->PPFlags |= TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_MAINTENANCE;\r
return 0;\r
\r
case PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR:\r
// PHYSICAL_PRESENCE_ENABLE_ACTIVATE + PHYSICAL_PRESENCE_CLEAR\r
// PHYSICAL_PRESENCE_CLEAR will be executed after reboot.\r
//\r
- if ((*PpiFlags & FLAG_RESET_TRACK) == 0) {\r
+ if ((PpiFlags->PPFlags & TCG_VENDOR_LIB_FLAG_RESET_TRACK) == 0) {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_ENABLE_ACTIVATE, PpiFlags);\r
- *PpiFlags |= FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags |= TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
} else {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_CLEAR, PpiFlags);\r
- *PpiFlags &= ~FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags &= ~TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
}\r
return TpmResponse;\r
\r
// PHYSICAL_PRESENCE_ENABLE_ACTIVATE + PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE\r
// PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE will be executed after reboot.\r
//\r
- if ((*PpiFlags & FLAG_RESET_TRACK) == 0) {\r
+ if ((PpiFlags->PPFlags & TCG_VENDOR_LIB_FLAG_RESET_TRACK) == 0) {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_ENABLE_ACTIVATE, PpiFlags);\r
- *PpiFlags |= FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags |= TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
} else {\r
TpmResponse = ExecutePhysicalPresence (TcgProtocol, PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE, PpiFlags);\r
- *PpiFlags &= ~FLAG_RESET_TRACK;\r
+ PpiFlags->PPFlags &= ~TCG_VENDOR_LIB_FLAG_RESET_TRACK;\r
} \r
return TpmResponse;\r
\r
default:\r
;\r
}\r
- return TPM_PP_BIOS_FAILURE;\r
+ return TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
}\r
\r
\r
**/\r
BOOLEAN\r
UserConfirm (\r
- IN UINT8 TpmPpCommand\r
+ IN UINT32 TpmPpCommand\r
)\r
{\r
CHAR16 *ConfirmText;\r
**/\r
BOOLEAN\r
HaveValidTpmRequest (\r
- IN EFI_PHYSICAL_PRESENCE *TcgPpData,\r
- IN UINT8 Flags,\r
- OUT BOOLEAN *RequestConfirmed\r
+ IN EFI_PHYSICAL_PRESENCE *TcgPpData,\r
+ IN EFI_PHYSICAL_PRESENCE_FLAGS Flags,\r
+ OUT BOOLEAN *RequestConfirmed\r
)\r
{\r
+ BOOLEAN IsRequestValid;\r
\r
*RequestConfirmed = FALSE;\r
\r
case PHYSICAL_PRESENCE_ENABLE_ACTIVATE_OWNER_TRUE:\r
case PHYSICAL_PRESENCE_DEACTIVATE_DISABLE_OWNER_FALSE:\r
case PHYSICAL_PRESENCE_SET_OPERATOR_AUTH:\r
- if ((Flags & FLAG_NO_PPI_PROVISION) != 0) {\r
+ if ((Flags.PPFlags & TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_PROVISION) != 0) {\r
*RequestConfirmed = TRUE;\r
}\r
break;\r
\r
case PHYSICAL_PRESENCE_CLEAR:\r
case PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR:\r
- if ((Flags & FLAG_NO_PPI_CLEAR) != 0) {\r
+ if ((Flags.PPFlags & TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_CLEAR) != 0) {\r
*RequestConfirmed = TRUE;\r
}\r
break;\r
\r
case PHYSICAL_PRESENCE_DEFERRED_PP_UNOWNERED_FIELD_UPGRADE:\r
- if ((Flags & FLAG_NO_PPI_MAINTENANCE) != 0) {\r
+ if ((Flags.PPFlags & TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_MAINTENANCE) != 0) {\r
*RequestConfirmed = TRUE;\r
}\r
break;\r
\r
case PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE:\r
case PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE:\r
- if ((Flags & FLAG_NO_PPI_CLEAR) != 0 && (Flags & FLAG_NO_PPI_PROVISION) != 0) {\r
+ if ((Flags.PPFlags & TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_CLEAR) != 0 && (Flags.PPFlags & TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_PROVISION) != 0) {\r
*RequestConfirmed = TRUE;\r
}\r
break;\r
break;\r
\r
default:\r
- //\r
- // Wrong Physical Presence command\r
- //\r
- return FALSE;\r
+ if (TcgPpData->PPRequest >= TCG_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
+ IsRequestValid = TcgPpVendorLibHasValidRequest (TcgPpData->PPRequest, Flags.PPFlags, RequestConfirmed);\r
+ if (!IsRequestValid) {\r
+ return FALSE;\r
+ } else {\r
+ break;\r
+ }\r
+ } else {\r
+ //\r
+ // Wrong Physical Presence command\r
+ //\r
+ return FALSE;\r
+ }\r
}\r
\r
- if ((Flags & FLAG_RESET_TRACK) != 0) {\r
+ if ((Flags.PPFlags & TCG_VENDOR_LIB_FLAG_RESET_TRACK) != 0) {\r
//\r
// It had been confirmed in last boot, it doesn't need confirm again.\r
//\r
**/\r
VOID\r
ExecutePendingTpmRequest (\r
- IN EFI_TCG_PROTOCOL *TcgProtocol,\r
- IN EFI_PHYSICAL_PRESENCE *TcgPpData,\r
- IN UINT8 Flags\r
+ IN EFI_TCG_PROTOCOL *TcgProtocol,\r
+ IN EFI_PHYSICAL_PRESENCE *TcgPpData,\r
+ IN EFI_PHYSICAL_PRESENCE_FLAGS Flags\r
)\r
{\r
EFI_STATUS Status;\r
UINTN DataSize;\r
BOOLEAN RequestConfirmed;\r
- UINT8 NewFlags;\r
+ EFI_PHYSICAL_PRESENCE_FLAGS NewFlags;\r
+ BOOLEAN ResetRequired;\r
+ UINT32 NewPPFlags;\r
\r
if (!HaveValidTpmRequest(TcgPpData, Flags, &RequestConfirmed)) {\r
//\r
// Invalid operation request.\r
//\r
- TcgPpData->PPResponse = TPM_PP_BIOS_FAILURE;\r
+ TcgPpData->PPResponse = TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
TcgPpData->LastPPRequest = TcgPpData->PPRequest;\r
TcgPpData->PPRequest = PHYSICAL_PRESENCE_NO_ACTION;\r
DataSize = sizeof (EFI_PHYSICAL_PRESENCE);\r
return;\r
}\r
\r
- if (!RequestConfirmed) {\r
+ ResetRequired = FALSE;\r
+ if (TcgPpData->PPRequest >= TCG_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
+ NewFlags = Flags;\r
+ NewPPFlags = NewFlags.PPFlags;\r
+ TcgPpData->PPResponse = TcgPpVendorLibExecutePendingRequest (TcgPpData->PPRequest, &NewPPFlags, &ResetRequired);\r
+ NewFlags.PPFlags = (UINT8)NewPPFlags;\r
+ } else {\r
+ if (!RequestConfirmed) {\r
+ //\r
+ // Print confirm text and wait for approval. \r
+ //\r
+ RequestConfirmed = UserConfirm (TcgPpData->PPRequest);\r
+ }\r
+\r
//\r
- // Print confirm text and wait for approval. \r
+ // Execute requested physical presence command\r
//\r
- RequestConfirmed = UserConfirm (TcgPpData->PPRequest);\r
- }\r
-\r
- //\r
- // Execute requested physical presence command\r
- //\r
- TcgPpData->PPResponse = TPM_PP_USER_ABORT;\r
- NewFlags = Flags;\r
- if (RequestConfirmed) {\r
- TcgPpData->PPResponse = ExecutePhysicalPresence (TcgProtocol, TcgPpData->PPRequest, &NewFlags);\r
+ TcgPpData->PPResponse = TCG_PP_OPERATION_RESPONSE_USER_ABORT;\r
+ NewFlags = Flags;\r
+ if (RequestConfirmed) {\r
+ TcgPpData->PPResponse = ExecutePhysicalPresence (TcgProtocol, TcgPpData->PPRequest, &NewFlags);\r
+ }\r
}\r
\r
//\r
// Save the flags if it is updated.\r
//\r
- if (Flags != NewFlags) {\r
+ if (CompareMem (&Flags, &NewFlags, sizeof(EFI_PHYSICAL_PRESENCE_FLAGS)) != 0) {\r
Status = gRT->SetVariable (\r
PHYSICAL_PRESENCE_FLAGS_VARIABLE,\r
&gEfiPhysicalPresenceGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
- sizeof (UINT8),\r
+ sizeof (EFI_PHYSICAL_PRESENCE_FLAGS),\r
&NewFlags\r
); \r
if (EFI_ERROR (Status)) {\r
return;\r
}\r
}\r
-\r
-\r
+ \r
//\r
// Clear request\r
//\r
- if ((NewFlags & FLAG_RESET_TRACK) == 0) {\r
+ if ((NewFlags.PPFlags & TCG_VENDOR_LIB_FLAG_RESET_TRACK) == 0) {\r
TcgPpData->LastPPRequest = TcgPpData->PPRequest;\r
TcgPpData->PPRequest = PHYSICAL_PRESENCE_NO_ACTION; \r
}\r
return;\r
}\r
\r
- if (TcgPpData->PPResponse == TPM_PP_USER_ABORT) {\r
+ if (TcgPpData->PPResponse == TCG_PP_OPERATION_RESPONSE_USER_ABORT) {\r
return;\r
}\r
\r
case PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE: \r
break;\r
default:\r
+ if (TcgPpData->LastPPRequest >= TCG_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION) {\r
+ if (ResetRequired) {\r
+ break;\r
+ } else {\r
+ return ;\r
+ }\r
+ }\r
if (TcgPpData->PPRequest != PHYSICAL_PRESENCE_NO_ACTION) {\r
break;\r
}\r
EFI_PHYSICAL_PRESENCE TcgPpData;\r
EFI_TCG_PROTOCOL *TcgProtocol;\r
EDKII_VARIABLE_LOCK_PROTOCOL *VariableLockProtocol;\r
- UINT8 PpiFlags;\r
+ EFI_PHYSICAL_PRESENCE_FLAGS PpiFlags;\r
\r
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **)&TcgProtocol);\r
if (EFI_ERROR (Status)) {\r
//\r
// Initialize physical presence flags.\r
//\r
- DataSize = sizeof (UINT8);\r
+ DataSize = sizeof (EFI_PHYSICAL_PRESENCE_FLAGS);\r
Status = gRT->GetVariable (\r
PHYSICAL_PRESENCE_FLAGS_VARIABLE,\r
&gEfiPhysicalPresenceGuid,\r
&PpiFlags\r
);\r
if (EFI_ERROR (Status)) {\r
- PpiFlags = FLAG_NO_PPI_PROVISION;\r
+ PpiFlags.PPFlags = TCG_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_PROVISION;\r
Status = gRT->SetVariable (\r
PHYSICAL_PRESENCE_FLAGS_VARIABLE,\r
&gEfiPhysicalPresenceGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
- sizeof (UINT8),\r
+ sizeof (EFI_PHYSICAL_PRESENCE_FLAGS),\r
&PpiFlags\r
);\r
if (EFI_ERROR (Status)) {\r
return ;\r
}\r
}\r
- DEBUG ((EFI_D_INFO, "[TPM] PpiFlags = %x\n", PpiFlags));\r
+ DEBUG ((EFI_D_INFO, "[TPM] PpiFlags = %x\n", PpiFlags.PPFlags));\r
\r
//\r
// This flags variable controls whether physical presence is required for TPM command. \r
}\r
}\r
\r
- DEBUG ((EFI_D_INFO, "[TPM] Flags=%x, PPRequest=%x\n", PpiFlags, TcgPpData.PPRequest));\r
+ DEBUG ((EFI_D_INFO, "[TPM] Flags=%x, PPRequest=%x\n", PpiFlags.PPFlags, TcgPpData.PPRequest));\r
\r
if (TcgPpData.PPRequest == PHYSICAL_PRESENCE_NO_ACTION) {\r
//\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_PHYSICAL_PRESENCE TcgPpData;\r
- UINTN DataSize;\r
- BOOLEAN RequestConfirmed;\r
- BOOLEAN LifetimeLock;\r
- BOOLEAN CmdEnable;\r
- EFI_TCG_PROTOCOL *TcgProtocol;\r
- UINT8 PpiFlags;\r
+ EFI_STATUS Status;\r
+ EFI_PHYSICAL_PRESENCE TcgPpData;\r
+ UINTN DataSize;\r
+ BOOLEAN RequestConfirmed;\r
+ BOOLEAN LifetimeLock;\r
+ BOOLEAN CmdEnable;\r
+ EFI_TCG_PROTOCOL *TcgProtocol;\r
+ EFI_PHYSICAL_PRESENCE_FLAGS PpiFlags;\r
\r
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **)&TcgProtocol);\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
}\r
\r
- DataSize = sizeof (UINT8);\r
+ DataSize = sizeof (EFI_PHYSICAL_PRESENCE_FLAGS);\r
Status = gRT->GetVariable (\r
PHYSICAL_PRESENCE_FLAGS_VARIABLE,\r
&gEfiPhysicalPresenceGuid,\r
projects / mirror_edk2.git / blobdiff