From: "Liming Gao" <liming.gao@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: Andrew Fish <afish@apple.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Bret Barkelew <bret.barkelew@microsoft.com>,
"Brian J . Johnson" <brian.johnson@hpe.com>,
"Chiu, Chasel" <chasel.chiu@intel.com>,
"Justen, Jordan L" <jordan.l.justen@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
"Leif Lindholm" <leif@nuviainc.com>,
Marvin H?user <mhaeuser@outlook.de>,
"Zimmer, Vincent" <vincent.zimmer@intel.com>,
"Gao, Zhichao" <zhichao.gao@intel.com>,
"Yao, Jiewen" <jiewen.yao@intel.com>,
Vitaly Cheptsov <vit9696@protonmail.com>,
Philippe Mathieu-Daude <philmd@redhat.com>
Subject: Re: [edk2-devel] [Patch v9 2/2] MdePkg/Test/BaseLib: Add SAFE_STRING_CONSTRAINT_CHECK unit test
Date: Thu, 21 May 2020 14:13:17 +0000 [thread overview]
Message-ID: <SN6PR11MB31975805730CDB9297C1333580B70@SN6PR11MB3197.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200520201022.28196-3-michael.d.kinney@intel.com>
Ack-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney
> Sent: Thursday, May 21, 2020 4:10 AM
> To: devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Ard Biesheuvel <ard.biesheuvel@linaro.org>; Bret Barkelew <bret.barkelew@microsoft.com>;
> Brian J . Johnson <brian.johnson@hpe.com>; Chiu, Chasel <chasel.chiu@intel.com>; Justen, Jordan L <jordan.l.justen@intel.com>;
> Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif@nuviainc.com>; Gao, Liming <liming.gao@intel.com>; Marvin H?user
> <mhaeuser@outlook.de>; Zimmer, Vincent <vincent.zimmer@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Vitaly Cheptsov <vit9696@protonmail.com>; Philippe Mathieu-Daude <philmd@redhat.com>
> Subject: [edk2-devel] [Patch v9 2/2] MdePkg/Test/BaseLib: Add SAFE_STRING_CONSTRAINT_CHECK unit test
>
> Use the safe string function StrCpyS() in BaseLib to test the
> SAFE_STRING_CONSTRAINT_CHECK() macro.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Bret Barkelew <bret.barkelew@microsoft.com>
> Cc: Brian J. Johnson <brian.johnson@hpe.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Marvin H?user <mhaeuser@outlook.de>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Vincent Zimmer <vincent.zimmer@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Vitaly Cheptsov <vit9696@protonmail.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
> ---
> .../UnitTest/Library/BaseLib/Base64UnitTest.c | 107 ++++++++++++++++++
> 1 file changed, 107 insertions(+)
>
> diff --git a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> index 8952f9da6c..2c4266491c 100644
> --- a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> +++ b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> @@ -290,6 +290,99 @@ RfcDecodeTest(
> return UNIT_TEST_PASSED;
> }
>
> +#define SOURCE_STRING L"Hello"
> +
> +STATIC
> +UNIT_TEST_STATUS
> +EFIAPI
> +SafeStringContraintCheckTest (
> + IN UNIT_TEST_CONTEXT Context
> + )
> +{
> + RETURN_STATUS Status;
> + CHAR16 Destination[20];
> + CHAR16 AllZero[20];
> +
> + //
> + // Zero buffer used to verify Destination is not modified
> + //
> + ZeroMem (AllZero, sizeof (AllZero));
> +
> + //
> + // Positive test case copy source unicode string to destination
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, sizeof (Destination) / sizeof (CHAR16), SOURCE_STRING);
> + UT_ASSERT_NOT_EFI_ERROR (Status);
> + UT_ASSERT_MEM_EQUAL (Destination, SOURCE_STRING, sizeof (SOURCE_STRING));
> +
> + //
> + // Positive test case with DestMax the same as Source size
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, sizeof (SOURCE_STRING) / sizeof (CHAR16), SOURCE_STRING);
> + UT_ASSERT_NOT_EFI_ERROR (Status);
> + UT_ASSERT_MEM_EQUAL (Destination, SOURCE_STRING, sizeof (SOURCE_STRING));
> +
> + //
> + // Negative test case with Destination NULL
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (NULL, sizeof (Destination) / sizeof (CHAR16), SOURCE_STRING);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_INVALID_PARAMETER);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with Source NULL
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, sizeof (Destination) / sizeof (CHAR16), NULL);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_INVALID_PARAMETER);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with DestMax too big
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, MAX_UINTN, SOURCE_STRING);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_INVALID_PARAMETER);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with DestMax 0
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, 0, SOURCE_STRING);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_INVALID_PARAMETER);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with DestMax smaller than Source size
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, 1, SOURCE_STRING);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with DestMax smaller than Source size by one character
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, sizeof (SOURCE_STRING) / sizeof (CHAR16) - 1, SOURCE_STRING);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + //
> + // Negative test case with overlapping Destination and Source
> + //
> + ZeroMem (Destination, sizeof (Destination));
> + Status = StrCpyS (Destination, sizeof (Destination) / sizeof (CHAR16), Destination);
> + UT_ASSERT_STATUS_EQUAL (Status, RETURN_ACCESS_DENIED);
> + UT_ASSERT_MEM_EQUAL (Destination, AllZero, sizeof (AllZero));
> +
> + return UNIT_TEST_PASSED;
> +}
> +
> /**
> Initialze the unit test framework, suite, and unit tests for the
> Base64 conversion APIs of BaseLib and run the unit tests.
> @@ -309,6 +402,7 @@ UnitTestingEntry (
> UNIT_TEST_FRAMEWORK_HANDLE Fw;
> UNIT_TEST_SUITE_HANDLE b64EncodeTests;
> UNIT_TEST_SUITE_HANDLE b64DecodeTests;
> + UNIT_TEST_SUITE_HANDLE SafeStringTests;
>
> Fw = NULL;
>
> @@ -367,6 +461,19 @@ UnitTestingEntry (
> AddTestCase (b64DecodeTests, "Incorrectly placed padding character", "Error4", RfcDecodeTest, NULL, CleanUpB64TestContext,
> &mBasicDecodeError4);
> AddTestCase (b64DecodeTests, "Too small of output buffer", "Error5", RfcDecodeTest, NULL, CleanUpB64TestContext,
> &mBasicDecodeError5);
>
> + //
> + // Populate the safe string Unit Test Suite.
> + //
> + Status = CreateUnitTestSuite (&SafeStringTests, Fw, "Safe String", "BaseLib.SafeString", NULL, NULL);
> + if (EFI_ERROR (Status)) {
> + DEBUG ((DEBUG_ERROR, "Failed in CreateUnitTestSuite for SafeStringTests\n"));
> + Status = EFI_OUT_OF_RESOURCES;
> + goto EXIT;
> + }
> +
> + // --------------Suite-----------Description--------------Class Name----------Function--------Pre---Post-------------------Context-----------
> + AddTestCase (SafeStringTests, "SAFE_STRING_CONSTRAINT_CHECK", "SafeStringContraintCheckTest", SafeStringContraintCheckTest,
> NULL, NULL, NULL);
> +
> //
> // Execute the tests.
> //
> --
> 2.21.0.windows.1
>
>
>
next prev parent reply other threads:[~2020-05-21 14:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 20:10 [Patch v9 0/2] Disable safe string constraint assertions Michael D Kinney
2020-05-20 20:10 ` [Patch v9 1/2] MdePkg: Fix SafeString performing assertions on runtime checks Michael D Kinney
2020-05-20 20:10 ` [Patch v9 2/2] MdePkg/Test/BaseLib: Add SAFE_STRING_CONSTRAINT_CHECK unit test Michael D Kinney
2020-05-21 4:24 ` Vitaly Cheptsov
2020-05-21 4:25 ` Vitaly Cheptsov
2020-05-21 14:13 ` Liming Gao [this message]
2020-05-20 20:13 ` [edk2-devel] [Patch v9 0/2] Disable safe string constraint assertions Michael D Kinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SN6PR11MB31975805730CDB9297C1333580B70@SN6PR11MB3197.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox