From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9293B1A1E31 for ; Mon, 19 Sep 2016 19:00:17 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 19 Sep 2016 19:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,365,1470726000"; d="scan'208";a="1053603081" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga002.jf.intel.com with ESMTP; 19 Sep 2016 19:00:17 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 19 Sep 2016 19:00:16 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 19 Sep 2016 19:00:16 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.101]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.96]) with mapi id 14.03.0248.002; Tue, 20 Sep 2016 10:00:12 +0800 From: "Wu, Hao A" To: Ard Biesheuvel , "edk2-devel@lists.01.org" , "Gao, Liming" CC: "vishalo@qti.qualcomm.com" , "leif.lindholm@linaro.org" Thread-Topic: [edk2] [PATCH v2 2/3] MdePkg/BaseMemoryLib*: add missing ASSERT()s Thread-Index: AQHSEk3anE3a3Xkm9kuGiOdJBjsUpKCBn2Xw Date: Tue, 20 Sep 2016 02:00:12 +0000 Message-ID: References: <1474272831-20840-1-git-send-email-ard.biesheuvel@linaro.org> <1474272831-20840-3-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1474272831-20840-3-git-send-email-ard.biesheuvel@linaro.org> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 2/3] MdePkg/BaseMemoryLib*: add missing ASSERT()s X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2016 02:00:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ard, The NULL checks for the input Guids in APIs CopyGuid(), CompareGuid() and IsZeroGuid() are implicitly done within calls to BaseLib APIs ReadUnaligned64() and WriteUnaligned64(). So I think the functions behavior matches with their comments. What do you think? Best Regards, Hao Wu > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ar= d > Biesheuvel > Sent: Monday, September 19, 2016 4:14 PM > To: edk2-devel@lists.01.org; Gao, Liming > Cc: vishalo@qti.qualcomm.com; leif.lindholm@linaro.org; Ard Biesheuvel > Subject: [edk2] [PATCH v2 2/3] MdePkg/BaseMemoryLib*: add missing > ASSERT()s >=20 > Add the ASSERT() statements to CopyGuid (), CompareGuid() and > IsZeroGuid() that are mentioned in the respective comments but > were missing from the actual code. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel > --- > MdePkg/Library/BaseMemoryLib/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/PeiMemoryLib/MemLibGuid.c | 8 ++++++++ > MdePkg/Library/UefiMemoryLib/MemLibGuid.c | 8 ++++++++ > 8 files changed, 64 insertions(+) >=20 > diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c > index b2590f83caef..dff9bde653a9 100644 > --- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c > b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c > +++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c > b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c > +++ b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c > b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c > index cbb385fddfba..60babaf0dc49 100644 > --- a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c > +++ b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c > @@ -47,6 +47,9 @@ CopyGuid ( > IN CONST GUID *SourceGuid > ) > { > + ASSERT (DestinationGuid !=3D NULL); > + ASSERT (SourceGuid !=3D NULL); > + > WriteUnaligned64 ( > (UINT64*)DestinationGuid, > ReadUnaligned64 ((CONST UINT64*)SourceGuid) > @@ -86,6 +89,9 @@ CompareGuid ( > UINT64 HighPartOfGuid1; > UINT64 HighPartOfGuid2; >=20 > + ASSERT (Guid1 !=3D NULL); > + ASSERT (Guid2 !=3D NULL); > + > LowPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1); > LowPartOfGuid2 =3D ReadUnaligned64 ((CONST UINT64*) Guid2); > HighPartOfGuid1 =3D ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); > @@ -164,6 +170,8 @@ IsZeroGuid ( > UINT64 LowPartOfGuid; > UINT64 HighPartOfGuid; >=20 > + ASSERT (Guid !=3D NULL); > + > LowPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid); > HighPartOfGuid =3D ReadUnaligned64 ((CONST UINT64*) Guid + 1); >=20 > -- > 2.7.4 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel