X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FEmuVariable%2FRuntimeDxe%2FEmuVariable.c;h=0eef1acfc47c5e9e20c3950263b17fe2dce7dec5;hp=b44da1c47486c09a5abc0f738b5bfb69b1dfb56d;hb=f53a07320e7021b5a80973cc7b265bd8ce5caf40;hpb=3088e811376d8893366c0a48d493b480e3e96fda;ds=sidebyside

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index b44da1c474..0eef1acfc4 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -506,38 +506,40 @@ Returns:
 
   if (Status == EFI_INVALID_PARAMETER) {
     return Status;
-  }
-  //
-  //  The size of the VariableName, including the Unicode Null in bytes plus
-  //  the DataSize is limited to maximum size of MAX_VARIABLE_SIZE (1024) bytes.
-  //
-  else if (sizeof (VARIABLE_HEADER) + (ArrayLength (VariableName) + DataSize) > MAX_VARIABLE_SIZE) {
+  } else if (!EFI_ERROR (Status) && Variable.Volatile && EfiAtRuntime()) {
+    //
+    // If EfiAtRuntime and the variable is Volatile and Runtime Access,  
+    // the volatile is ReadOnly, and SetVariable should be aborted and 
+    // return EFI_WRITE_PROTECTED.
+    //
+    return EFI_WRITE_PROTECTED;
+  } else if (sizeof (VARIABLE_HEADER) + (ArrayLength (VariableName) + DataSize) > MAX_VARIABLE_SIZE) {
+    //
+    //  The size of the VariableName, including the Unicode Null in bytes plus
+    //  the DataSize is limited to maximum size of MAX_VARIABLE_SIZE (1024) bytes.
+    //
     return EFI_INVALID_PARAMETER;
-  }
-  //
-  //  Make sure if runtime bit is set, boot service bit is set also
-  //
-  else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS
+  } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS
           ) {
+    //
+    //  Make sure if runtime bit is set, boot service bit is set also
+    //
     return EFI_INVALID_PARAMETER;
-  }
-  //
-  // Runtime but Attribute is not Runtime
-  //
-  else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {
+  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {
+    //
+    // Runtime but Attribute is not Runtime
+    //
     return EFI_INVALID_PARAMETER;
-  }
-  //
-  // Cannot set volatile variable in Runtime
-  //
-  else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {
+  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {
+    //
+    // Cannot set volatile variable in Runtime
+    //
     return EFI_INVALID_PARAMETER;
-  }
-  //
-  // Setting a data variable with no access, or zero DataSize attributes
-  // specified causes it to be deleted.
-  //
-  else if (DataSize == 0 || Attributes == 0) {
+  } else if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {
+    //
+    // Setting a data variable with no access, or zero DataSize attributes
+    // specified causes it to be deleted.
+    //
     if (!EFI_ERROR (Status)) {
       Variable.CurrPtr->State &= VAR_DELETED;
       return EFI_SUCCESS;
@@ -692,6 +694,11 @@ Returns:
     //   Make sure RT Attribute is set if we are in Runtime phase.
     //
     return EFI_INVALID_PARAMETER;
+  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {
+    //
+    // Cannot Query volatile variable in Runtime
+    //
+    return EFI_INVALID_PARAMETER;
   }
 
   if((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0) {