From nobody Sun May 5 01:05:43 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+92464+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+92464+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660614578; cv=none; d=zohomail.com; s=zohoarc; b=KHqRfAieo47KMpu8aIhfnE85Ww5s+2Ype7iadBR6QMsCKAlW+Wlqv+xToS9RHKKWLqgtr9kZ6wBApwxjXP2TV51Iz8HPuwh7KhW27a9D7PkbL6SpP9ubIz/76l+C3tJ77H9kkagncqLWGEnHKxxHNeLPqwTX6DX4SlO4PFHT4uk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660614578; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZZh1EDGy1ahss1/0golhKQLObKZl2Zte/Y8L+xjS5MQ=; b=lIqQfad+2RWdp/r0R96RCLL2xiKpJJafFKarF2q3nNkCWBzAd4kNV79XS0KkzskPuXmlveZhTlcpbSfcx/RD1UY+nKDGh+UHEge/H7H2AgDrY+HejxxWJvY6OqjSP5UdL4Krb3lIXkPQNOaZXIDRmi3rLeuX8N9nXsoZv+OSUo4= 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+92464+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 1660614578895243.77450505403476; Mon, 15 Aug 2022 18:49:38 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yGy6YY1788612xuRx7Q8T0F2; Mon, 15 Aug 2022 18:49:38 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.10717.1660614577294868510 for ; Mon, 15 Aug 2022 18:49:37 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10440"; a="275154347" X-IronPort-AV: E=Sophos;i="5.93,239,1654585200"; d="scan'208";a="275154347" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2022 18:49:37 -0700 X-IronPort-AV: E=Sophos;i="5.93,239,1654585200"; d="scan'208";a="603362913" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.26.67]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2022 18:49:36 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Konstantin Aladyshev , Bob Feng , Liming Gao , Yuwei Chen Subject: [edk2-devel] [Patch edk2-stable202208 1/2] BaseTools/Source/C/GenSec: Preserve prior behavior when no GUID provided Date: Mon, 15 Aug 2022 18:49:27 -0700 Message-Id: <20220816014928.2206-2-michael.d.kinney@intel.com> In-Reply-To: <20220816014928.2206-1-michael.d.kinney@intel.com> References: <20220816014928.2206-1-michael.d.kinney@intel.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,michael.d.kinney@intel.com X-Gm-Message-State: NhNbpJy0gAXvpV0lNVn4vO0Lx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660614578; bh=xC1h0yMTPQvfW/vnW2zOSYiLXhZHwR49nbBWZ2v92iA=; h=Cc:Date:From:Reply-To:Subject:To; b=XmVdfiLJVHg152HPv347h90IZHYSppCG31QoGQQd/lh3NaNWcPk47ougqZc+j9iwcFq qJ3YyHRhnrlOvMutgJvlzB5MD+Gokiw0TZJvD4VXpLotI8g+SM623xHwMs/cOiNhN1v/M cuJ1WyNoNm7PfvB+8XYkrWbSUlqjlpQ99aM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660614579586100002 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4022 If no GUID value is provided with EFI_SECTION_FREEFORM_SUBTYPE_GUID then preserve the prior behavior until all downstream platforms are updated to pass in a GUID value. Cc: Konstantin Aladyshev Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Michael D Kinney Reviewed-by: Bob Feng --- BaseTools/Source/C/GenSec/GenSec.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec= /GenSec.c index d86cc197cc26..191a49d99228 100644 --- a/BaseTools/Source/C/GenSec/GenSec.c +++ b/BaseTools/Source/C/GenSec/GenSec.c @@ -1752,8 +1752,7 @@ Routine Description: // Check whether there is GUID for the SubtypeGuid section // if ((SectType =3D=3D EFI_SECTION_FREEFORM_SUBTYPE_GUID) && (CompareGuid = (&VendorGuid, &mZeroGuid) =3D=3D 0)) { - Error (NULL, 0, 1001, "Missing options", "GUID"); - goto Finish; + fprintf (stdout, "Warning: input guid value is required for section ty= pe %s\n", SectionName); } =20 // @@ -1825,13 +1824,25 @@ Routine Description: break; =20 case EFI_SECTION_FREEFORM_SUBTYPE_GUID: - Status =3D GenSectionSubtypeGuidSection ( - InputFileName, - InputFileAlign, - InputFileNum, - &VendorGuid, - &OutFileBuffer - ); + if (CompareGuid (&VendorGuid, &mZeroGuid) =3D=3D 0) { + // + // Preserve existing behavior when no GUID value is provided + // + Status =3D GenSectionCommonLeafSection ( + InputFileName, + InputFileNum, + SectType, + &OutFileBuffer + ); + } else { + Status =3D GenSectionSubtypeGuidSection ( + InputFileName, + InputFileAlign, + InputFileNum, + &VendorGuid, + &OutFileBuffer + ); + } break; =20 case EFI_SECTION_VERSION: --=20 2.37.1.windows.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 (#92464): https://edk2.groups.io/g/devel/message/92464 Mute This Topic: https://groups.io/mt/93050981/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- From nobody Sun May 5 01:05:43 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+92465+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+92465+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660614579; cv=none; d=zohomail.com; s=zohoarc; b=lFxIZ4+J+4LzC+beexkvb2ZcGOApWvPVIAO6xKC6Wrm5oOrAI0fPk/bbVHwJP71ajIC/w8OmSg5oZcwk34yDmUtEwnZwP2e1UKfxS1PslZIzqajs9i2F3KFNWZWte4MK5B8G4DWTekfU6jwc+EG+PBqrzyJS1nqbcvNbyeVeDBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660614579; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=orBiKLNbtWgPAjfz3OY90zKWhzjbBGImxA9UM89SIOE=; b=iboClDKXd9eFNZ0d81TbP3NQicmr7ePC3LwsGwDMqE1/OfZ1DjWoywlTnGDljSUmUwtuqQzMyJlSf+5RfcAgI1BbnvHF+69ygWY7CJL+KrvpWK88pFprWaLEIyOFfo7YkA3vq/15fx3ZJyjPO+GEZ8657BI2LADq8/VQpUzWyDw= 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+92465+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 1660614579634840.6836769925865; Mon, 15 Aug 2022 18:49:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sumtYY1788612xIBxzGe9IF4; Mon, 15 Aug 2022 18:49:39 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.10717.1660614577294868510 for ; Mon, 15 Aug 2022 18:49:38 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10440"; a="275154349" X-IronPort-AV: E=Sophos;i="5.93,239,1654585200"; d="scan'208";a="275154349" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2022 18:49:37 -0700 X-IronPort-AV: E=Sophos;i="5.93,239,1654585200"; d="scan'208";a="603362916" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.26.67]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2022 18:49:37 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Konstantin Aladyshev , Bob Feng , Liming Gao , Yuwei Chen Subject: [edk2-devel] [Patch edk2-stable202208 2/2] BaseTools/Source/C/GenSec: Fix EFI_SECTION_FREEFORM_SUBTYPE_GUID header Date: Mon, 15 Aug 2022 18:49:28 -0700 Message-Id: <20220816014928.2206-3-michael.d.kinney@intel.com> In-Reply-To: <20220816014928.2206-1-michael.d.kinney@intel.com> References: <20220816014928.2206-1-michael.d.kinney@intel.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,michael.d.kinney@intel.com X-Gm-Message-State: rqvLcoVDQh4vRh95riGHJxkxx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660614579; bh=vLDeUwm8W3BI+jyXMQYNChX0ouO7SmksZGe1HXfKRtY=; h=Cc:Date:From:Reply-To:Subject:To; b=BjZMRUr78Eam03aBxbPn/7u9T4wOztx6I8zQ8PYyGHN5PVlzK2IKUK6Y1crVeRZY6yS ngVU590RK9g5jLPT3It0atFti7givtGaFPFNx/TORDjsvXTNw+HI9Y/8zXyd26jTmbXmI 9deJ4zvuUkB0AH+lx9x8z8ZdgDfvXFP+HCY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660614581606100007 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4021 When the size of a EFI_SECTION_FREEFORM_SUBTYPE_GUID section required the use of EFI_FREEFORM_SUBTYPE_GUID_SECTION2 header, set the section type to EFI_SECTION_FREEFORM_SUBTYPE_GUID. Cc: Konstantin Aladyshev Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Michael D Kinney Reviewed-by: Bob Feng --- BaseTools/Source/C/GenSec/GenSec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec= /GenSec.c index 191a49d99228..e318d45f77d3 100644 --- a/BaseTools/Source/C/GenSec/GenSec.c +++ b/BaseTools/Source/C/GenSec/GenSec.c @@ -1112,7 +1112,7 @@ Routine Description: // if (TotalLength >=3D MAX_SECTION_SIZE) { SubtypeGuidSect2 =3D (EFI_FREEFORM_SUBTYPE_GUID_SECTION2 *) FileBuffer; - SubtypeGuidSect2->CommonHeader.Type =3D EFI_SECTION_GUID_DEFINED; + SubtypeGuidSect2->CommonHeader.Type =3D EFI_SECTION_FREEFORM_SUBTY= PE_GUID; SubtypeGuidSect2->CommonHeader.Size[0] =3D (UINT8) 0xff; SubtypeGuidSect2->CommonHeader.Size[1] =3D (UINT8) 0xff; SubtypeGuidSect2->CommonHeader.Size[2] =3D (UINT8) 0xff; --=20 2.37.1.windows.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 (#92465): https://edk2.groups.io/g/devel/message/92465 Mute This Topic: https://groups.io/mt/93050982/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-