From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id AB4ADAC1B81 for ; Tue, 30 Jan 2024 23:23:52 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=h/TDFp1bfBZTWhElH3l7mj76shVLtourZlnrV5P6wEc=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1706657031; v=1; b=o10Mq3wyzSD/gKiDDh2ZpPlWOajM2bqzFnKe4Dg/YcucGyBpgCJGZgZVz1dsUIT/dikd38QX g/1DCoQsAw2lPjnhCNWgNHSTOMg0DnNg79Kl4/36rHAJh0h63Om0URC0U7droQc2r+bArunjSqL fi5iY7ybp8PHHA2N5UU5GNL4= X-Received: by 127.0.0.2 with SMTP id 3UPOYY7687511xjSp208xCIa; Tue, 30 Jan 2024 15:23:51 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.1903.1706657030693987539 for ; Tue, 30 Jan 2024 15:23:50 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DF32416F3; Tue, 30 Jan 2024 15:24:33 -0800 (PST) X-Received: from beelzebub.ast.arm.com (abhsin07-ThinkStation-P720.austin.arm.com [10.118.30.31]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 561843F5A1; Tue, 30 Jan 2024 15:23:50 -0800 (PST) From: "Abhimanyu Singh" To: devel@edk2.groups.io Cc: Abhi Singh , G Edhaya Chandran , Barton Gao , Carolyn Gjertsen , Stuart Yoder , Abhi Singh Subject: [edk2-devel] [PATCH v2 7/7] uefi-sct/SctPkg: TCG MOR & MORLOCK tests Date: Tue, 30 Jan 2024 17:23:32 -0600 Message-Id: <20240130232332.235302-8-Abhi.Singh@arm.com> In-Reply-To: <20240130232332.235302-1-Abhi.Singh@arm.com> References: <20240130232332.235302-1-Abhi.Singh@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,Abhi.Singh@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: mm5rL7mZfLwM3jVjG1hhgzsDx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=o10Mq3wy; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io SCT spec: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4374 BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4419 -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 Cc: Barton Gao Cc: Carolyn Gjertsen Cc: Stuart Yoder Signed-off-by: Abhi Singh Change-Id: I54b9b751ae166b0921500eabb38e1836318bb501 --- uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteReques= t/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOve= rwriteRequest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c b/uefi= -sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteRequest/Bla= ckBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c index 6406730c64ce..512cad3df6ee 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteR= equest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TCGMemoryOverwriteR= equest/BlackBoxTest/TCGMemoryOverwriteRequestBBTestFunction.c @@ -819,7 +819,7 @@ MORLOCK_SET_VARIABLE: DataSize, // DataSize= =0D NULL // Data=0D );=0D - if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D + if (Status =3D=3D EFI_WRITE_PROTECTED || EFI_INVALID_PARAMETER) {=0D Result =3D EFI_TEST_ASSERTION_PASSED;=0D } else {=0D Result =3D EFI_TEST_ASSERTION_FAILED;=0D @@ -829,7 +829,7 @@ MORLOCK_SET_VARIABLE: StandardLib,=0D Result,=0D gTCGMemoryOverwriteRequestTestFunctionAssertionGuid011,= =0D - L"MemoryOverwriteRequestControlLock - SetVariable() with= Data parameter as NULL returns EFI_WRITE_PROTECTED",=0D + L"MemoryOverwriteRequestControlLock - SetVariable() with= Data parameter as NULL returns either EFI_WRITE_PROTECTED or EFI_INVALID_P= ARAMETER",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D @@ -1624,7 +1624,7 @@ MORLOCK_LOCKED_STATE: DataSize, // DataSize=0D &MemoryOverwriteRequestControlData // Data=0D );=0D - if (Status =3D=3D EFI_ACCESS_DENIED) {=0D + if (Status =3D=3D EFI_ACCESS_DENIED || EFI_INVALID_PARAMETER) {=0D Result =3D EFI_TEST_ASSERTION_PASSED;=0D } else {=0D Result =3D EFI_TEST_ASSERTION_FAILED;=0D @@ -1634,7 +1634,7 @@ MORLOCK_LOCKED_STATE: StandardLib,=0D Result,=0D gTCGMemoryOverwriteRequestTestFunctionAssertionGuid031,= =0D - L"MemoryOverwriteRequestControl - When MORLOCK is locked= -without-key, an attempt to delete the MOR variable must return EFI_ACCESS_= DENIED",=0D + 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",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D @@ -2148,7 +2148,7 @@ MORLOCK_LOCKED_KEY_STATE: DataSize, // DataSize=0D &MemoryOverwriteRequestControlData // Data=0D );=0D - if (Status =3D=3D EFI_ACCESS_DENIED) {=0D + if (Status =3D=3D EFI_ACCESS_DENIED || EFI_INVALID_PARAMETER) {=0D Result =3D EFI_TEST_ASSERTION_PASSED;=0D } else {=0D Result =3D EFI_TEST_ASSERTION_FAILED;=0D @@ -2158,7 +2158,7 @@ MORLOCK_LOCKED_KEY_STATE: StandardLib,=0D Result,=0D gTCGMemoryOverwriteRequestTestFunctionAssertionGuid045,= =0D - L"MemoryOverwriteRequestControl - When MORLOCK is locked= -with-key, an attempt to delete the MOR variable must return EFI_ACCESS_DEN= IED",=0D + 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",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D --=20 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] -=-=-=-=-=-=-=-=-=-=-=-