From 39dfd12de48d01023ef293c37f524b8c2137f7c1 Mon Sep 17 00:00:00 2001 From: Michael Kinney Date: Tue, 10 Jan 2017 09:08:52 -0800 Subject: [PATCH] QuarkPlatformPkg/Tpm12DeviceLibAtmelI2c: Fix SubmitCommand() out size https://bugzilla.tianocore.org/show_bug.cgi?id=336 When the Tpm12SubmitCommand() detects a response packet that is the same size as a TPM_RSP_COMMAND_HDR, it returns EFI_SUCCESS without reading any additional response packet information from the TPM. In that case, the return parameter OutputParameterBlockSize is not be updated, so the size of that OutputParameterBlock returned is the value passed in which could be larger than what is actually returned from the TPM. Set the OutputParameterBlockSize to the size of the TPM_RSP_COMMAND_HDR when this specific condition is detected. Cc: Kelly Steele Cc: Lee Leahy Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney Reviewed-by: Lee Leahy --- QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c index 08a005f1fd..3aab530643 100644 --- a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c +++ b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c @@ -355,6 +355,7 @@ Tpm12SubmitCommand ( TpmOutSize = SwapBytes32 (ReadUnaligned32 (&ResponseHeader->paramSize)); if (TpmOutSize == sizeof (TPM_RSP_COMMAND_HDR)) { + *OutputParameterBlockSize = TpmOutSize; Status = EFI_SUCCESS; goto Done; } -- 2.39.2