From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: chasel.chiu@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Mon, 02 Sep 2019 07:01:12 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Sep 2019 07:01:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="184504236" Received: from kmsmsx156.gar.corp.intel.com ([172.21.138.133]) by orsmga003.jf.intel.com with ESMTP; 02 Sep 2019 07:01:11 -0700 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.22]) by KMSMSX156.gar.corp.intel.com ([169.254.1.101]) with mapi id 14.03.0439.000; Mon, 2 Sep 2019 22:01:10 +0800 From: "Chiu, Chasel" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Kubacki, Michael A" , "Desimone, Nathaniel L" , "Gao, Liming" Subject: Re: [PATCH] MinPlatformPkg/TestPointCheckLib: Add check for pointers Thread-Topic: [PATCH] MinPlatformPkg/TestPointCheckLib: Add check for pointers Thread-Index: AQHVYYrYfeNdQlF1pEqMApNloGWgtKcYai8w Date: Mon, 2 Sep 2019 14:01:09 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC5047E746@PGSMSX111.gar.corp.intel.com> References: <20190902123452.27716-1-shenglei.zhang@intel.com> <20190902123452.27716-3-shenglei.zhang@intel.com> In-Reply-To: <20190902123452.27716-3-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzdlY2M4N2EtOTQ5NS00NTczLWJiOTEtZDkyODQ3NWNmZWQ4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNnFaMDM1aUczYmlhKzA2dFJ5VjlsSVZuQ05OREdLV2JSS0FGZWFEait4NnRhWVNnNThWQnplVkdLUEQ0ZHczWSJ9 x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.205] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please extend copyright for files you touched, and one more update in below= inline. > -----Original Message----- > From: Zhang, Shenglei > Sent: Monday, September 2, 2019 8:35 PM > To: devel@edk2.groups.io > Cc: Kubacki, Michael A ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Gao, Liming > Subject: [PATCH] MinPlatformPkg/TestPointCheckLib: Add check for pointers >=20 > In DxeCheckBootVariable.c, add check for BootOrder and Variable that > return EFI_NOT_FOUND when they are NULL. > In DxeCheckGcd.c, add check for GcdIoMap to ensure it not NULL when > allocating memory to what it points to. >=20 > Cc: Michael Kubacki > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Signed-off-by: Shenglei Zhang > --- > .../Test/Library/TestPointCheckLib/DxeCheckBootVariable.c | 6 ++++++ > .../Test/Library/TestPointCheckLib/DxeCheckGcd.c | 4 +++- > 2 files changed, 9 insertions(+), 1 deletion(-) >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckB > ootVariable.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckB > ootVariable.c > index 85bd5b3d..a9af33a3 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckB > ootVariable.c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCh > +++ eckBootVariable.c > @@ -130,6 +130,9 @@ TestPointCheckLoadOptionVariable ( > for (ListIndex =3D 0; ListIndex < > sizeof(mLoadOptionVariableList)/sizeof(mLoadOptionVariableList[0]); > ListIndex++) { > UnicodeSPrint (BootOrderName, sizeof(BootOrderName), L"%sOrder", > mLoadOptionVariableList[ListIndex]); > Status =3D GetVariable2 (BootOrderName, &gEfiGlobalVariableGuid, > (VOID **)&BootOrder, &OrderSize); > + if(BootOrder =3D=3D NULL) { > + return EFI_NOT_FOUND;; > + } Align indents with previous lines. > if (EFI_ERROR(Status)) { > continue; > } > @@ -222,6 +225,9 @@ TestPointCheckKeyOptionVariable ( > for (Index =3D 0; ; Index++) { > UnicodeSPrint (KeyOptionName, sizeof(KeyOptionName), L"%s%04x", > mKeyOptionVariableList[ListIndex], Index); > Status =3D GetVariable2 (KeyOptionName, &gEfiGlobalVariableGuid, > &Variable, &Size); > + if(Variable =3D=3D NULL) { > + return EFI_NOT_FOUND;; > + } > if (!EFI_ERROR(Status)) { > DumpKeyOption (KeyOptionName, Variable, Size); > } else { > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckG > cd.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckG > cd.c > index 82709d44..989606b6 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckG > cd.c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCh > +++ eckGcd.c > @@ -241,7 +241,9 @@ TestPointDumpGcd ( > } > } > if (GcdMemoryMap !=3D NULL) { > - *GcdIoMap =3D AllocateCopyPool (NumberOfDescriptors * > sizeof(EFI_GCD_IO_SPACE_DESCRIPTOR), IoMap); > + if (GcdIoMap !=3D NULL){ > + *GcdIoMap =3D AllocateCopyPool (NumberOfDescriptors * > sizeof(EFI_GCD_IO_SPACE_DESCRIPTOR), IoMap); > + } > *GcdIoMapNumberOfDescriptors =3D NumberOfDescriptors; > } > } > -- > 2.18.0.windows.1