From 82e47eb22f1873835ef38e2941e266adfe1ff836 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Mon, 9 Mar 2015 13:03:42 +0000 Subject: [PATCH] MdeModulePkg 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@17030 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Variable/RuntimeDxe/VariableSmmRuntimeDxe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c index 873930ce67..3a87298160 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c @@ -459,10 +459,6 @@ RuntimeServiceGetVariable ( return EFI_INVALID_PARAMETER; } - if ((*DataSize != 0) && (Data == NULL)) { - return EFI_INVALID_PARAMETER; - } - TempDataSize = *DataSize; VariableNameSize = StrSize (VariableName); SmmVariableHeader = NULL; @@ -527,7 +523,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); -- 2.39.2