[edk2-devel] [PATCH v2 7/7] uefi-sct/SctPkg: TCG MOR & MORLOCK tests

["Abhimanyu Singh" <Abhi.Singh@arm.com>]

SCT spec: https://bugzilla.tianocore.org/show_bug.cgi?id=4374

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4419

-relax acceptable EFI return codes to fit the edk2 implementation
 as well as the updates made to TCG Platform Reset Attack Spec.
  -changes made to test assertions 11, 31, and 45.
  -now accept either EFI_INVALID_PARAMETER or EFI_ACCESS_DENIED.

Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Barton Gao <gaojie@byosoft.com.cn>
Cc: Carolyn Gjertsen <Carolyn.Gjertsen@amd.com>
Cc: Stuart Yoder <Stuart.Yoder@arm.com>

Signed-off-by: Abhi Singh <abhi.singh@arm.com>
Change-Id: I54b9b751ae166b0921500eabb38e1836318bb501
---
 uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c
index 6406730c64ce..512cad3df6ee 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c
@@ -819,7 +819,7 @@ MORLOCK_SET_VARIABLE:
                   DataSize,                                    // DataSize
                   NULL                                         // Data
                   );
-  if (Status == EFI_INVALID_PARAMETER) {
+  if (Status == EFI_WRITE_PROTECTED || EFI_INVALID_PARAMETER) {
     Result = EFI_TEST_ASSERTION_PASSED;
   } else {
     Result = EFI_TEST_ASSERTION_FAILED;
@@ -829,7 +829,7 @@ MORLOCK_SET_VARIABLE:
                   StandardLib,
                   Result,
                   gTCGMemoryOverwriteRequestTestFunctionAssertionGuid011,
-                  L"MemoryOverwriteRequestControlLock - SetVariable() with Data parameter as NULL returns EFI_WRITE_PROTECTED",
+                  L"MemoryOverwriteRequestControlLock - SetVariable() with Data parameter as NULL returns either EFI_WRITE_PROTECTED or EFI_INVALID_PARAMETER",
                   L"%a:%d:Status - %r",
                   __FILE__,
                   (UINTN)__LINE__,
@@ -1624,7 +1624,7 @@ MORLOCK_LOCKED_STATE:
                   DataSize,                             // DataSize
                   &MemoryOverwriteRequestControlData    // Data
                   );
-  if (Status == EFI_ACCESS_DENIED) {
+  if (Status == EFI_ACCESS_DENIED || EFI_INVALID_PARAMETER) {
     Result = EFI_TEST_ASSERTION_PASSED;
   } else {
     Result = EFI_TEST_ASSERTION_FAILED;
@@ -1634,7 +1634,7 @@ MORLOCK_LOCKED_STATE:
                   StandardLib,
                   Result,
                   gTCGMemoryOverwriteRequestTestFunctionAssertionGuid031,
-                  L"MemoryOverwriteRequestControl - When MORLOCK is locked-without-key, an attempt to delete the MOR variable must return EFI_ACCESS_DENIED",
+                  L"MemoryOverwriteRequestControl - When MORLOCK is locked-without-key, an attempt to delete the MOR variable must return either EFI_ACCESS_DENIED or EFI_INVALID_PARAMETER",
                   L"%a:%d:Status - %r",
                   __FILE__,
                   (UINTN)__LINE__,
@@ -2148,7 +2148,7 @@ MORLOCK_LOCKED_KEY_STATE:
                   DataSize,                             // DataSize
                   &MemoryOverwriteRequestControlData    // Data
                   );
-  if (Status == EFI_ACCESS_DENIED) {
+  if (Status == EFI_ACCESS_DENIED || EFI_INVALID_PARAMETER) {
     Result = EFI_TEST_ASSERTION_PASSED;
   } else {
     Result = EFI_TEST_ASSERTION_FAILED;
@@ -2158,7 +2158,7 @@ MORLOCK_LOCKED_KEY_STATE:
                   StandardLib,
                   Result,
                   gTCGMemoryOverwriteRequestTestFunctionAssertionGuid045,
-                  L"MemoryOverwriteRequestControl - When MORLOCK is locked-with-key, an attempt to delete the MOR variable must return EFI_ACCESS_DENIED",
+                  L"MemoryOverwriteRequestControl - When MORLOCK is locked-without-key, an attempt to delete the MOR variable must return either EFI_ACCESS_DENIED or EFI_INVALID_PARAMETER",
                   L"%a:%d:Status - %r",
                   __FILE__,
                   (UINTN)__LINE__,
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114838): https://edk2.groups.io/g/devel/message/114838
Mute This Topic: https://groups.io/mt/104065289/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-