Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SecurityPkg: Fix TPM 1.2 NV Storage Command Size byte order 

Fix Tpm12NvWriteValue() command/response length byte order.
Tpm12SubmitCommand() was using the value from Command.Hdr.paramSize
which was swapped to be Big Endian, but the function was
expecting it in UINT32 Little Endian

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
This commit is contained in:
Samer El-Haj-Mahmoud 2016-04-29 04:24:04 +08:00 committed by Zhang, Chao B
parent fd338d8bd7
commit 8b1331df8b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
View File

@ -2,6 +2,7 @@
Implement TPM1.2 NV storage related command. Implement TPM1.2 NV storage related command.
Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. <BR> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. <BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<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
@ -199,8 +200,9 @@ Tpm12NvWriteValue (
{ {
EFI_STATUS Status; EFI_STATUS Status;
TPM_CMD_NV_WRITE_VALUE Command; TPM_CMD_NV_WRITE_VALUE Command;
UINT32 CommandLength;
TPM_RSP_COMMAND_HDR Response; TPM_RSP_COMMAND_HDR Response;
UINT32 Length; UINT32 ResponseLength;
if (DataSize > sizeof (Command.Data)) { if (DataSize > sizeof (Command.Data)) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
@ -210,14 +212,15 @@ Tpm12NvWriteValue (
// send Tpm command TPM_ORD_NV_WriteValue // send Tpm command TPM_ORD_NV_WriteValue
// //
Command.Hdr.tag = SwapBytes16 (TPM_TAG_RQU_COMMAND); Command.Hdr.tag = SwapBytes16 (TPM_TAG_RQU_COMMAND);
Command.Hdr.paramSize = SwapBytes32 (sizeof (Command) - sizeof(Command.Data) + DataSize); CommandLength = sizeof (Command) - sizeof(Command.Data) + DataSize;
Command.Hdr.paramSize = SwapBytes32 (CommandLength);
Command.Hdr.ordinal = SwapBytes32 (TPM_ORD_NV_WriteValue); Command.Hdr.ordinal = SwapBytes32 (TPM_ORD_NV_WriteValue);
Command.NvIndex = SwapBytes32 (NvIndex); Command.NvIndex = SwapBytes32 (NvIndex);
Command.Offset = SwapBytes32 (Offset); Command.Offset = SwapBytes32 (Offset);
Command.DataSize = SwapBytes32 (DataSize); Command.DataSize = SwapBytes32 (DataSize);
CopyMem (Command.Data, Data, DataSize); CopyMem (Command.Data, Data, DataSize);
Length = sizeof (Response); ResponseLength = sizeof (Response);
Status = Tpm12SubmitCommand (Command.Hdr.paramSize, (UINT8 *)&Command, &Length, (UINT8 *)&Response); Status = Tpm12SubmitCommand (CommandLength, (UINT8 *)&Command, &ResponseLength, (UINT8 *)&Response);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }