From 52e764f7965310a3f252795bfc3237b935c0396e Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Mon, 9 Mar 2015 13:05:55 +0000 Subject: SecurityPkg Variable: Keep the behavior of Variable Dxe and SMM drivers consistent to return EFI_NOT_FOUND when a specified variable doesn't exist and Data parameter is NULL but DataSize parameter is valid in GetVariable() invocation. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Feng Tian git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17031 6f19259b-4bc3-4df7-8a09-765794883524 --- .../VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'SecurityPkg/VariableAuthenticated') diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c index 3e2ed08972..be5c935a88 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.c @@ -473,10 +473,6 @@ RuntimeServiceGetVariable ( return EFI_INVALID_PARAMETER; } - if ((*DataSize != 0) && (Data == NULL)) { - return EFI_INVALID_PARAMETER; - } - TempDataSize = *DataSize; VariableNameSize = StrSize (VariableName); SmmVariableHeader = NULL; @@ -541,7 +537,11 @@ RuntimeServiceGetVariable ( goto Done; } - CopyMem (Data, (UINT8 *)SmmVariableHeader->Name + SmmVariableHeader->NameSize, SmmVariableHeader->DataSize); + if (Data != NULL) { + CopyMem (Data, (UINT8 *)SmmVariableHeader->Name + SmmVariableHeader->NameSize, SmmVariableHeader->DataSize); + } else { + Status = EFI_INVALID_PARAMETER; + } Done: ReleaseLockOnlyAtBootTime (&mVariableServicesLock); -- cgit v1.2.3