Topics

[PATCH edk2-test 1/1] uefi-sct/SctPkg: OpenEx incorrect assertion


Heinrich Schuchardt
 

The functional tests for OpenEx() use RecordAssertion() statements that
lack a print code for the Tpl argument. This leads to a segmentation
violation.

Signed-off-by: Heinrich Schuchardt <@xypron>
=2D--
.../SimpleFileSystemExBBTestFunction_OpenEx.c | 8 ++++----
.../SimpleFileSystemExBBTestFunction_OpenEx.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/B=
lackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/Te=
stCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExB=
BTestFunction_OpenEx.c
index c2bf9b4fdc92..193383993cbe 100644
=2D-- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackB=
oxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBox=
Test/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid027,
L"OpenEx() Basic Test - checkpoint1 ----Test1----Asy=
nc",
- L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name -=
%",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid039,
L"OpenEx() Basic Test - checkpoint1 ---Async",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid043,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test=
4----Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid047,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test=
5---Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/B=
lackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/Te=
stCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExB=
BTestFunction_OpenEx.c
index 70ec88f1c065..894d42fc370d 100644
=2D-- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackB=
oxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBox=
Test/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid027,
L"OpenEx() Basic Test - checkpoint1 ----Test1----Asy=
nc",
- L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name -=
%",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid039,
L"OpenEx() Basic Test - checkpoint1 ---Async",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid043,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test=
4----Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid047,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test=
5---Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s=
",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
=2D-
2.29.2


Grant Likely
 

Looks like an obvious fix

Reviewed-by: Grant Likely <grant.likely@...>


Samer El-Haj-Mahmoud
 

Reviewed-by: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@...>

-----Original Message-----
From: Heinrich Schuchardt <@xypron>
Sent: Saturday, November 21, 2020 11:08 AM
To: EDK II Development <devel@edk2.groups.io>
Cc: Eric Jin <eric.jin@...>; G Edhaya Chandran
<@edhay>; Barton Gao <gaojie@...>;
Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@...>; Heinrich
Schuchardt <@xypron>
Subject: [PATCH edk2-test 1/1] uefi-sct/SctPkg: OpenEx incorrect assertion

The functional tests for OpenEx() use RecordAssertion() statements that lack
a print code for the Tpl argument. This leads to a segmentation violation.

Signed-off-by: Heinrich Schuchardt <@xypron>
---
.../SimpleFileSystemExBBTestFunction_OpenEx.c | 8 ++++----
.../SimpleFileSystemExBBTestFunction_OpenEx.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/uefi-
sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c b/uefi-
sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c
index c2bf9b4fdc92..193383993cbe 100644
--- a/uefi-
sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackB
+++ oxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid027,
L"OpenEx() Basic Test - checkpoint1 ----Test1----Async",
- L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - %",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -2152,7 +2152,7 @@
BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid039,
L"OpenEx() Basic Test - checkpoint1 ---Async",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -2656,7 +2656,7 @@
BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid043,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4----Open
File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -3302,7 +3302,7 @@
BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid047,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5---Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, diff --git a/uefi-
sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c b/uefi-
sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c
index 70ec88f1c065..894d42fc370d 100644
--- a/uefi-
sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/Sim
pleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-
sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackB
+++ oxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid027,
L"OpenEx() Basic Test - checkpoint1 ----Test1----Async",
- L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - %",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -2152,7 +2152,7 @@
BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid039,
L"OpenEx() Basic Test - checkpoint1 ---Async",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -2656,7 +2656,7 @@
BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid043,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4----Open
File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl, @@ -3302,7 +3302,7 @@
BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid047,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5---Open File",
- L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
--
2.29.2
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.