From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B394A21A00AE6 for ; Wed, 12 Sep 2018 00:32:45 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Sep 2018 00:32:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,363,1531810800"; d="scan'208";a="89281606" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 12 Sep 2018 00:32:43 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 12 Sep 2018 00:32:39 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 12 Sep 2018 00:32:38 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.143]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.16]) with mapi id 14.03.0319.002; Wed, 12 Sep 2018 15:31:10 +0800 From: "Gao, Liming" To: "Zhao, ZhiqiangX" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH] BaseTools: Check the index of array. Thread-Index: AQHURDFeF7WFhpMz+EmNddIeATpsSKTsTCkQ Date: Wed, 12 Sep 2018 07:31:09 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E2F63BF@SHSMSX104.ccr.corp.intel.com> References: <20180904092611.16444-1-zhiqiangx.zhao@intel.com> In-Reply-To: <20180904092611.16444-1-zhiqiangx.zhao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: Check the index of array. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2018 07:32:45 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Zhiqiang: I have two comments.=20 1. Please update commit title with the detail message.=20 2. Please update the patch to skip the case of file size as zero, and also = add comments for each ASSERT.=20 Thanks Liming >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >Zhaozh1x >Sent: Tuesday, September 04, 2018 5:26 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [edk2] [PATCH] BaseTools: Check the index of array. > >For structure PCD, add the checker for the ARRAY >element assignment and Buffer FieldSize. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: ZhiqiangX Zhao >Cc: Liming Gao >Cc: Yonghong Zhu >Cc: Bob Feng >--- > BaseTools/Source/C/Common/PcdValueCommon.h | 7 +++++++ > BaseTools/Source/Python/Workspace/DscBuildData.py | 8 ++++++++ > 2 files changed, 15 insertions(+) > >diff --git a/BaseTools/Source/C/Common/PcdValueCommon.h >b/BaseTools/Source/C/Common/PcdValueCommon.h >index 3922428ded..255afdfcc3 100644 >--- a/BaseTools/Source/C/Common/PcdValueCommon.h >+++ b/BaseTools/Source/C/Common/PcdValueCommon.h >@@ -22,6 +22,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY >KIND, EITHER EXPRESS OR IMPLIED. > #define __ARRAY_ELEMENT_SIZE(TYPE, Field) (sizeof((TYPE *)0)->Field[0]) > #define __OFFSET_OF(TYPE, Field) ((UINT32) &(((TYPE *)0)->Field)) > #define __FLEXIBLE_SIZE(Size, TYPE, Field, MaxIndex) if (__FIELD_SIZE(T= YPE, >Field) =3D=3D 0) Size =3D MAX((__OFFSET_OF(TYPE, Field) + >__ARRAY_ELEMENT_SIZE(TYPE, Field) * (MaxIndex)), Size) >+#define __ARRAY_SIZE(Array) (sizeof(Array)/sizeof(Array[0])) >+ >+#if defined(_MSC_EXTENSIONS) >+#define __STATIC_ASSERT static_assert >+#else >+#define __STATIC_ASSERT _Static_assert >+#endif > > VOID > PcdEntryPoint ( >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index 748452623f..98055bcb50 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -1766,8 +1766,12 @@ class DscBuildData(PlatformBuildClassObject): > # > CApp =3D CApp + ' FieldSize =3D __FIELD_SIZE(%s, %s)= ;\n' % >(Pcd.DatumType, FieldName) > CApp =3D CApp + ' Value =3D %s; // From %s Line = %d Value %s\n' % >(DscBuildData.IntToCString(Value, ValueSize), FieldList[FieldName][1], >FieldList[FieldName][2], FieldList[FieldName][0]) >+ CApp =3D CApp + ' __STATIC_ASSERT(__FIELD_SIZE(%s, %= s) >=3D %d, >"Input buffer exceeds the buffer array");\n' % (Pcd.DatumType, FieldName, >ValueSize) > CApp =3D CApp + ' memcpy (&Pcd->%s, Value, (FieldSiz= e > 0 && >FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize) > else: >+ if '[' in FieldName and ']' in FieldName: >+ Index =3D int(FieldName.split('[')[1].split(']')[= 0]) >+ CApp =3D CApp + ' __STATIC_ASSERT((%d < __ARRAY_= SIZE(Pcd- >>%s)) || (__ARRAY_SIZE(Pcd->%s) =3D=3D 0), "array checker error");\n' % (I= ndex, >FieldName.split('[')[0], FieldName.split('[')[0]) > if ValueSize > 4: > CApp =3D CApp + ' Pcd->%s =3D %dULL; // From %s = Line %d >Value %s\n' % (FieldName, Value, FieldList[FieldName][1], >FieldList[FieldName][2], FieldList[FieldName][0]) > else: >@@ -1848,8 +1852,12 @@ class DscBuildData(PlatformBuildClassObject): > # > CApp =3D CApp + ' FieldSize =3D __FIELD_SIZE(%s,= %s);\n' % >(Pcd.DatumType, FieldName) > CApp =3D CApp + ' Value =3D %s; // From %s L= ine %d Value %s\n' % >(DscBuildData.IntToCString(Value, ValueSize), FieldList[FieldName][1], >FieldList[FieldName][2], FieldList[FieldName][0]) >+ CApp =3D CApp + ' __STATIC_ASSERT(__FIELD_SIZE(%= s, %s) >=3D %d, >"Input buffer exceeds the buffer array");\n' % (Pcd.DatumType, FieldName, >ValueSize) > CApp =3D CApp + ' memcpy (&Pcd->%s, Value, (Fiel= dSize > 0 && >FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize) > else: >+ if '[' in FieldName and ']' in FieldName: >+ Index =3D int(FieldName.split('[')[1].split('= ]')[0]) >+ CApp =3D CApp + ' __STATIC_ASSERT((%d < __AR= RAY_SIZE(Pcd- >>%s)) || (__ARRAY_SIZE(Pcd->%s) =3D=3D 0), "array checker error");\n' % (I= ndex, >FieldName.split('[')[0], FieldName.split('[')[0]) > if ValueSize > 4: > CApp =3D CApp + ' Pcd->%s =3D %dULL; // From= %s Line %d >Value %s\n' % (FieldName, Value, FieldList[FieldName][1], >FieldList[FieldName][2], FieldList[FieldName][0]) > else: >-- >2.14.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel