From nobody Thu May 16 16:26:39 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+106087+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+106087+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686756270; cv=none; d=zohomail.com; s=zohoarc; b=InrCuRKvcRy5iBEkVS2bg4FHrTLLGIXC5CoFZXsEl84gWL4GM3WDpCb491j3iIDKApCSnR0GNh1oammGiCkB6e0MeeSdxJ7yiVr+ifFnBe/YoPEmhevfvKut8/JQUT+1Ua82iOVYSyR78tNlxFbb5R9tA3yFMXkPw3SIQeDN1V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686756270; 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=r2q0v31h/oGT6njtKAjLnYo8EX3VOX7FJ7OgEx5YJuI=; b=SCv+aSVdYYitT5DLsa8CJqR4cLwsbHjv469mUIHxzWtKS9MtwzJjmC/HVeqONBVTCEqjdreXADf0M+RduD6/8/3LNhxa2OG7dMgfp9upYep4qQsg+N8s+p05EdfEsaS2EGwSAeRhVThT6xeVp3A8cHkECLXutDMyu+l/RgG9uGM= 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+106087+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 168675627021979.7647922780443; Wed, 14 Jun 2023 08:24:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bpMIYY1788612xZpQXMSRiwa; Wed, 14 Jun 2023 08:24:29 -0700 X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.12786.1686751214230976019 for ; Wed, 14 Jun 2023 07:00:14 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="348276965" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="348276965" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 07:00:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="745084401" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="745084401" X-Received: from gguo-desk.gar.corp.intel.com ([10.5.215.23]) by orsmga001.jf.intel.com with ESMTP; 14 Jun 2023 07:00:11 -0700 From: brucex.wang@intel.com To: devel@edk2.groups.io Cc: BruceX Wang , Guo Dong , Ray Ni , Sean Rhodes , James Lu Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix incorrect code on AddSectionHeader Date: Wed, 14 Jun 2023 22:00:05 +0800 Message-Id: <9d76dda748aba4b4614d99227d225c87157c5f84.1686750331.git.brucex.wang@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,brucex.wang@intel.com X-Gm-Message-State: 8h6jjq66jSYwg3lGM3PWnia2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1686756269; bh=VnWbSygX5nF6aAcKEn/gndGlPCmvoxlETlSpnr0TAiI=; h=Cc:Date:From:Reply-To:Subject:To; b=DeYfafkC5ymKo7dv0ZDKTGisiSGWD1OfPk+6a7Zfp+gj0uyhev661o2U5gVcVJ3zmYc E7iTpyUO1dV9YhXYVbYBBvY4+MoLPajFku65gpP5htZRsYecfgaoxh2jorNZDZn21Lg4F 2VGYIyTNHvm6NzSbsOnL3HDoZm1ve0M4DK4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1686756270605100008 Content-Type: text/plain; charset="utf-8" From: BruceX Wang Fix incorrect code on AddSectionHeader32() and AddSectionHeader64() Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Signed-off-by: BruceX Wang Reviewed-by: Gua Guo --- UefiPayloadPkg/Tools/ElfFv.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/Tools/ElfFv.py b/UefiPayloadPkg/Tools/ElfFv.py index a3d5bf08b9..3f0f9272a7 100644 --- a/UefiPayloadPkg/Tools/ElfFv.py +++ b/UefiPayloadPkg/Tools/ElfFv.py @@ -267,7 +267,7 @@ def AddSectionHeader64(SHentry, NewUPLEntrylen, Section= HeaderEntrySize, Index, R # if RemoveNameOffset !=3D 0 that is remove function. if (RemoveNameOffset !=3D 0): if (unpacked_header.sh_name > RemoveNameOffset): - unpacked_header.sh_name -=3D RemoveNameOffset + unpacked_header.sh_name -=3D len (SectionName) # Modify size of name string section entry in section entry. if (Index =3D=3D StringIndexNumber): unpacked_header.sh_size -=3D len (SectionName) @@ -298,7 +298,7 @@ def AddSectionHeader32(SHentry, NewUPLEntrylen, Section= HeaderEntrySize, Index, R # if RemoveNameOffset !=3D 0 that is remove function. if (RemoveNameOffset !=3D 0): if (unpacked_header.sh_name > RemoveNameOffset): - unpacked_header.sh_name -=3D RemoveNameOffset + unpacked_header.sh_name -=3D len (SectionName) # Modify size of name string section entry in section entry. if (Index =3D=3D StringIndexNumber): unpacked_header.sh_size -=3D len (SectionName) @@ -710,7 +710,7 @@ def AddSection32(UniversalPayloadEntry, AddSectionName,= ElfHeaderOffset, Section ElfHeaderSize =3D 52 ElfHandPH =3D ElfHeaderSize + (elf_header.e_phnum * elf_header.e_p= hentsize) NewUPLEntry =3D UPLEntry[:ElfHandPH] - # Keep Section header and program header table, AddSection64() onl= y recombined section and section header. + # Keep Section header and program header table, AddSection32() onl= y recombined section and section header. NewUPLEntry =3D bytearray(NewUPLEntry) # Sections is recombined. # 1. name of added section is added in name string section. --=20 2.39.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 (#106087): https://edk2.groups.io/g/devel/message/106087 Mute This Topic: https://groups.io/mt/99528264/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-