External email: Use caution opening links or atta= chments

On 09/23/20 00:13, Jeff Brasen wrote:
> Any comments on this change?

I suggest CC'ing the maintainers responsible for reviewing this change. (I don't know who they are, unfortunately -- is there a Maintainers.txt file in the uefi-sct tree?)

Thanks
Laszlo

>
>
> Thanks,
>
> Jeff
>
> ________________________________
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Friday, September 11, 2020 11:23 AM
> To: devel@edk2.groups.io <devel@edk2.groups.io>
> Cc: Jeff Brasen <jbrasen@nvidia.com>
> Subject: [PATCH] uefi-sct/SctPkg: Correct issue with memory protectio= n enabled.
>
> On systems with memory protection enabled the modification of local > function initialization data results in permission issue. Make a copy= of
> data prior to modification.
>
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
> ---
> .../UnicodeCollationBBTestFunction.c    &nb= sp;     | 38 ++++++++++---------
> .../UnicodeCollation2BBTestFunction.c    &n= bsp;    | 38 ++++++++++---------
> 2 files changed, 42 insertions(+), 34 deletions(-)
>
> diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollat= ion/BlackBoxTest/UnicodeCollationBBTestFunction.c b/uefi-sct/SctPkg/TestCas= e/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFun= ction.c
> index 6fa11e6c..e0b4c1d9 100644
> --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/Bla= ckBoxTest/UnicodeCollationBBTestFunction.c
> +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/Bla= ckBoxTest/UnicodeCollationBBTestFunction.c
> @@ -25,7 +25,7 @@ Abstract:
> --*/
>
>
>
>
>
> -#include "SctLib.h"
> +#include "SctLib.h"
>
> #include "UnicodeCollationBBTestMain.h"
>
>
>
>
>
> @@ -337,6 +337,7 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;            &= nbsp;           &nbs= p;     };
>
>
>
>    CHAR16       &nb= sp;            =            TestDataSav[MA= X_SIZE_OF_STRING + 1];
>
> + CHAR16         &= nbsp;           &nbs= p;         TestDataRw[MAX_SIZE_OF_S= TRING + 1];
>
>
>
>
>
>
>
> @@ -368,14 +369,15 @@ BBTestStrLwrFunctionAutoTest (
>      //
>
>      // Backup current test data
>
>      //
>
> +    CopyUnicodeString (TestDataRw, TestData[Index]);<= br> >
>      CopyUnicodeString (TestDataSav, TestDat= a[Index]);
>
>
>
>      //
>
>      // For each test data, test the StrLwr = functionality.
>
>      //
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrLwr (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrLwr (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -390,15 +392,15 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>
>
>
>
> -    CopyUnicodeString (TestDataSav, TestData[Index]);=
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> +    CopyUnicodeString (TestDataSav, TestDataRw);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrEql (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrEql (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -413,7 +415,7 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>    };
>
>
>
> @@ -458,6 +460,7 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;            &= nbsp;           &nbs= p;     };
>
>
>
>    CHAR16       &nb= sp;            =            TestDataSav[MA= X_SIZE_OF_STRING + 1];
>
> + CHAR16         &= nbsp;           &nbs= p;         TestDataRw[MAX_SIZE_OF_S= TRING + 1];
>
>
>
>
>
>
>
> @@ -490,13 +493,14 @@ BBTestStrUprFunctionAutoTest (
>      // Backup current test data
>
>      //
>
>      CopyUnicodeString (TestDataSav, TestDat= a[Index]);
>
> +    CopyUnicodeString (TestDataRw, TestData[Index]);<= br> >
>
>
>      //
>
>      // For each test data, test the StrUpr = functionality.
>
>      //
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrUpr (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrUpr (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -511,14 +515,14 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>
>
> -    CopyUnicodeString (TestDataSav, TestData[Index]);=
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> +    CopyUnicodeString (TestDataSav, TestDataRw);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrEql (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrEql (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -533,7 +537,7 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>    };
>
>
>
> diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollat= ion2/BlackBoxTest/UnicodeCollation2BBTestFunction.c b/uefi-sct/SctPkg/TestC= ase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTes= tFunction.c
> index 653b263a..19ff6764 100644
> --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/Bl= ackBoxTest/UnicodeCollation2BBTestFunction.c
> +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/Bl= ackBoxTest/UnicodeCollation2BBTestFunction.c
> @@ -25,7 +25,7 @@ Abstract:
> --*/
>
>
>
>
>
> -#include "SctLib.h"
> +#include "SctLib.h"
>
> #include "UnicodeCollation2BBTestMain.h"
>
>
>
> STATIC CONST STRICOLL_TEST_DATA_FIELD    &n= bsp;        mStriCollTestData[] =3D{
>
> @@ -335,6 +335,7 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;            &= nbsp;           &nbs= p;     };
>
>
>
>    CHAR16       &nb= sp;            =            TestDataSav[MA= X_SIZE_OF_STRING + 1];
>
> + CHAR16         &= nbsp;           &nbs= p;         TestDataRw[MAX_SIZE_OF_S= TRING + 1];
>
>
>
>
>
>
>
> @@ -367,13 +368,14 @@ BBTestStrLwrFunctionAutoTest (
>      // Backup current test data
>
>      //
>
>      CopyUnicodeString (TestDataSav, TestDat= a[Index]);
>
> +    CopyUnicodeString (TestDataRw, TestData[Index]);<= br> >
>
>
>      //
>
>      // For each test data, test the StrLwr = functionality.
>
>      //
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrLwr (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrLwr (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -388,15 +390,15 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>
>
>
>
> -    CopyUnicodeString (TestDataSav, TestData[Index]);=
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> +    CopyUnicodeString (TestDataSav, TestDataRw);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrEql (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrEql (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -411,7 +413,7 @@ BBTestStrLwrFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>    };
>
>
>
> @@ -456,6 +458,7 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;            &= nbsp;           &nbs= p;     };
>
>
>
>    CHAR16       &nb= sp;            =            TestDataSav[MA= X_SIZE_OF_STRING + 1];
>
> + CHAR16         &= nbsp;           &nbs= p;         TestDataRw[MAX_SIZE_OF_S= TRING + 1];
>
>
>
>
>
>
>
> @@ -488,13 +491,14 @@ BBTestStrUprFunctionAutoTest (
>      // Backup current test data
>
>      //
>
>      CopyUnicodeString (TestDataSav, TestDat= a[Index]);
>
> +    CopyUnicodeString (TestDataRw, TestData[Index]);<= br> >
>
>
>      //
>
>      // For each test data, test the StrUpr = functionality.
>
>      //
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrUpr (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrUpr (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -509,14 +513,14 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>
>
> -    CopyUnicodeString (TestDataSav, TestData[Index]);=
>
> -    UnicodeCollation->StrLwr (UnicodeCollation, Te= stData[Index]);
>
> -    UnicodeCollation->StrUpr (UnicodeCollation, Te= stData[Index]);
>
> +    CopyUnicodeString (TestDataSav, TestDataRw);
>
> +    UnicodeCollation->StrLwr (UnicodeCollation, Te= stDataRw);
>
> +    UnicodeCollation->StrUpr (UnicodeCollation, Te= stDataRw);
>
>
>
> -    if (CheckStrEql (TestDataSav, TestData[Index])) {=
>
> +    if (CheckStrEql (TestDataSav, TestDataRw)) {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_PASSED;
>
>      } else {
>
>        AssertionType =3D EFI_TEST_= ASSERTION_FAILED;
>
> @@ -531,7 +535,7 @@ BBTestStrUprFunctionAutoTest (
>           &nbs= p;         __FILE__,
>
>           &nbs= p;         (UINTN)__LINE__,
>
>           &nbs= p;         TestDataSav,
>
> -           &n= bsp;       TestData[Index]
>
> +           &n= bsp;       TestDataRw
>
>           &nbs= p;         );
>
>    };
>
>
>
> --
> 2.25.1
>
>
>
>
>
>
>