From nobody Thu Mar 28 11:08:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92046+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92046+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1659453298; cv=none; d=zohomail.com; s=zohoarc; b=cC1NV5gN/lm7l9zW/d6cPft9vOwV8sFWY8GgsQM02KymRbWPfYVNgC35+LXCPUOo9Eg71UbNrtFOnAh8DdIBBYK8UzL6CofeJJzmyvwGNoei5bAQORiIxqz2J37bT/oDwWrl6KJsyJ1jdZY95zacV23cr2o3/c8GSEDo2zc4yNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659453298; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=kupIJ3HzpNpEWjYhhQBv3dpyONo4D8+Fv2o8EAoe3WY=; b=NZ+VHQ4ADOSMhmViDcmGvW40wtCA3aoSunBU+M4dq7LskE43aE7LuRbUKBRxHFwqUQANP690RVfI45nz/8dMQgGwO+3B4hHFr608gHsu1HvcQu+QsqNR0IpV6U5skUaCuLxuSfZgwMYanpbS/wYXVrnCXa5COpu3zAI71seGFW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92046+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1659453298163370.59860015734955; Tue, 2 Aug 2022 08:14:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZFNzYY1788612xPnvaLMakRT; Tue, 02 Aug 2022 08:14:57 -0700 X-Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mx.groups.io with SMTP id smtpd.web10.7541.1659453296527895330 for ; Tue, 02 Aug 2022 08:14:56 -0700 X-Received: by mail-lf1-f41.google.com with SMTP id x39so12829474lfu.7 for ; Tue, 02 Aug 2022 08:14:56 -0700 (PDT) X-Gm-Message-State: ngAaEnXNRwrTCdJE3PGHll5Mx1787277AA= X-Google-Smtp-Source: AA6agR7/yAQ1bfO24JVg3/aiGquj3XZcxUfHvjaZpLoMHtcLr6A8b4PvIwAhwRbELmkkpylF2dZayA== X-Received: by 2002:a05:6512:1054:b0:48a:f321:60be with SMTP id c20-20020a056512105400b0048af32160bemr4704995lfb.84.1659453294380; Tue, 02 Aug 2022 08:14:54 -0700 (PDT) X-Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id c6-20020a19e346000000b0048a82fec50esm2118793lfk.305.2022.08.02.08.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Aug 2022 08:14:53 -0700 (PDT) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, Konstantin Aladyshev Subject: [edk2-devel] [PATCH] BaseTools: Correct initialization data size check for array PCDs Date: Tue, 2 Aug 2022 18:15:11 +0300 Message-Id: <20220802151511.24778-1-aladyshev22@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,aladyshev22@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659453297; bh=hoNFtms22QcHWzOHe7GS7AZwnDDst2qXSxTBi+qsT18=; h=Cc:Date:From:Reply-To:Subject:To; b=qoft2OHhHa3UJg0TMmbvme0LJtKDnbE0Tl/MiyUsxevBZpbGfuAMnTkkIMdMGuHqoIR mpwHkF1ywP3nqTnbtXyicf4mnmO2d7jsyjPKNnZxoqM4cFuYsjKvao7neY6/5CmC7EZw3 yNOrUurIShWKOjAQkvyP8ofnm2KQfaiS9R8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659453300116100003 Content-Type: text/plain; charset="utf-8" Currently it is not possible to initialize all elements in the array PCD. For example, this PCD would result to a build failure: gTokenSpaceGuid.PcdArray|{0x11, 0x22}|UINT8[2]|0x4C4CB9A3 Correct logical operator in the initialization data size checks to fix the issue. Signed-off-by: Konstantin Aladyshev --- .../Source/Python/Workspace/DscBuildData.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 41f93c93f2..ccb4cf378f 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -2089,12 +2089,12 @@ class DscBuildData(PlatformBuildClassObject): pcdarraysize =3D Pcd.PcdArraySize() if "{CODE(" in Pcd.DefaultValueFromDec: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_INIT= _Value) < %d * sizeof(%s), "Pcd %s.%s Value in Dec exceed the array capabil= ity %s"); // From %s Line %s \n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCNa= me,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidCName, Pcd.TokenCName,P= cd.DatumType,Pcd.DefaultValueFromDecInfo[0],Pcd.DefaultValueFromDecInfo[1]) + CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_INIT= _Value) <=3D %d * sizeof(%s), "Pcd %s.%s Value in Dec exceed the array capa= bility %s"); // From %s Line %s \n ' % (Pcd.TokenSpaceGuidCName, Pcd.Token= CName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidCName, Pcd.TokenCNam= e,Pcd.DatumType,Pcd.DefaultValueFromDecInfo[0],Pcd.DefaultValueFromDecInfo[= 1]) CApp =3D CApp + ' PcdArraySize =3D sizeof(%s_%s_INIT_V= alue);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) CApp =3D CApp + ' memcpy (Pcd, %s_%s_INIT_Value,PcdAr= raySize);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) else: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(%d < %d * sizeof(= %s), "Pcd %s.%s Value in Dec exceed the array capability %s"); // From %s L= ine %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidCN= ame, Pcd.TokenCName,Pcd.DatumType,Pcd.DefaultValueFromDecInfo[0],Pcd.Defaul= tValueFromDecInfo[1]) + CApp =3D CApp + '__STATIC_ASSERT(%d <=3D %d * size= of(%s), "Pcd %s.%s Value in Dec exceed the array capability %s"); // From %= s Line %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGui= dCName, Pcd.TokenCName,Pcd.DatumType,Pcd.DefaultValueFromDecInfo[0],Pcd.Def= aultValueFromDecInfo[1]) CApp =3D CApp + ' PcdArraySize =3D %d;\n' % ValueSize CApp =3D CApp + ' Value =3D %s; // From DEC Defau= lt Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DefaultV= alueFromDec) CApp =3D CApp + ' memcpy (Pcd, Value, PcdArraySize);\= n' @@ -2204,7 +2204,7 @@ class DscBuildData(PlatformBuildClassObject): if "{CODE(" in Value: if Pcd.IsArray() and Pcd.Capacity[-1] !=3D "-1": pcdarraysize =3D Pcd.PcdArraySize() - CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_= %s_%s_Value) < %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array ca= pability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Sk= uName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidCN= ame, Pcd.TokenCName,Pcd.DatumType, valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_= %s_%s_Value) <=3D %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array= capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName= ,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGui= dCName, Pcd.TokenCName,Pcd.DatumType, valuefrom) CApp =3D CApp+ ' PcdArraySize =3D sizeof(%s_%s_%s_= %s_Value);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, DefaultS= toreName) CApp =3D CApp + ' memcpy (Pcd, &%s_%s_%s_%s_Value= ,PcdArraySize);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, Def= aultStoreName) else: @@ -2217,12 +2217,12 @@ class DscBuildData(PlatformBuildClassObject): pcdarraysize =3D Pcd.PcdArraySize() if "{CODE(" in pcddefaultvalue: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s= _%s_%s_%s_Value) < %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the arra= y capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCNa= me,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceG= uidCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s= _%s_%s_%s_Value) <=3D %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the a= rray capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.Token= CName,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpa= ceGuidCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) CApp =3D CApp + ' PcdArraySize =3D sizeof(%s_%= s_%s_%s_Value);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, Def= aultStoreName) CApp =3D CApp + ' memcpy (Pcd, %s_%s_%s_%s_Va= lue, PcdArraySize);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, = DefaultStoreName) else: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(%d < %d *= sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array capability %s"); // F= rom %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidC= Name, Pcd.TokenCName,Pcd.DatumType,valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(%d <=3D %= d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array capability %s"); /= / From %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGu= idCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) CApp =3D CApp + ' PcdArraySize =3D %d;\n' % Va= lueSize CApp =3D CApp + ' Value =3D %s; // From D= SC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.= DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.Def= aultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue) CApp =3D CApp + ' memcpy (Pcd, Value, PcdArra= ySize);\n' @@ -2238,7 +2238,7 @@ class DscBuildData(PlatformBuildClassObject): if "{CODE(" in Value: if Pcd.IsArray() and Pcd.Capacity[-1] !=3D "-1": pcdarraysize =3D Pcd.PcdArraySize() - CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_= %s_%s_Value) < %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array ca= pability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Sk= uName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidCN= ame, Pcd.TokenCName,Pcd.DatumType,valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s_%s_= %s_%s_Value) <=3D %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array= capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName= ,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGui= dCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) CApp =3D CApp + ' PcdArraySize =3D sizeof(%s_%s_%s= _%s_Value);\n '% (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, DefaultS= toreName) CApp =3D CApp + ' memcpy (Pcd, &%s_%s_%s_%s_Value= , PcdArraySize);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, Def= aultStoreName) else: @@ -2251,12 +2251,12 @@ class DscBuildData(PlatformBuildClassObject): pcdarraysize =3D Pcd.PcdArraySize() if "{CODE(" in pcddefaultvalue: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s= _%s_%s_%s_Value) < %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the arra= y capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCNa= me,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceG= uidCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(sizeof(%s= _%s_%s_%s_Value) <=3D %d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the a= rray capability %s"); // From %s \n' % (Pcd.TokenSpaceGuidCName, Pcd.Token= CName,SkuName, DefaultStoreName,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpa= ceGuidCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) CApp + ' PcdArraySize =3D sizeof(%s_%s_%s_%s_V= alue);\n ' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, DefaultStore= Name) CApp =3D CApp + ' memcpy (Pcd, %s_%s_%s_%s_Va= lue, PcdArraySize);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName, = DefaultStoreName) else: if Pcd.Capacity[-1] !=3D "-1": - CApp =3D CApp + '__STATIC_ASSERT(%d < %d *= sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array capability %s"); // F= rom %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGuidC= Name, Pcd.TokenCName,Pcd.DatumType,valuefrom) + CApp =3D CApp + '__STATIC_ASSERT(%d <=3D %= d * sizeof(%s), "Pcd %s.%s Value in Dsc exceed the array capability %s"); /= / From %s \n' % (ValueSize,pcdarraysize,Pcd.BaseDatumType,Pcd.TokenSpaceGu= idCName, Pcd.TokenCName,Pcd.DatumType,valuefrom) CApp =3D CApp + ' PcdArraySize =3D %d;\n' % Va= lueSize CApp =3D CApp + ' Value =3D %s; // From D= SC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.= DscRawValue.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.Defaul= tValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue) CApp =3D CApp + ' memcpy (Pcd, Value, PcdArra= ySize);\n' --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92046): https://edk2.groups.io/g/devel/message/92046 Mute This Topic: https://groups.io/mt/92772329/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-