MdeModulePkg/Variable: Attribute combination should return EFI_UNSUPP…

…ORTED

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4341

Commit 21320ef broke some tests in the AuthVar_Conf test
in edk2-test.  There are 2 testcases that invoke SetVariable
with the following attribute value:

(EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS)

EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and the UEFI spec
says this should return EFI_UNSUPPORTED.

Cc: Liming Gao <[email protected]>
Cc: Hao A Wu <[email protected]>
Cc: Sunny Wang <[email protected]>

Signed-off-by: Stuart Yoder <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Reviewed-by: Sunny Wang <[email protected]>

MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c

@@ -2676,7 +2676,11 @@ VariableServiceSetVariable (
     //
     // Only EFI_VARIABLE_NON_VOLATILE attribute is invalid
     //
-    return EFI_INVALID_PARAMETER;
+    if ((Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0) {
+      return EFI_UNSUPPORTED;
+    } else {
+      return EFI_INVALID_PARAMETER;
+    }
   } else if ((Attributes & VARIABLE_ATTRIBUTE_AT_AW) != 0) {
     if (!mVariableModuleGlobal->VariableGlobal.AuthSupport) {
       //