From nobody Thu Apr 25 20:01:51 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+85519+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+85519+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641876967; cv=none; d=zohomail.com; s=zohoarc; b=jE8hvJ9luYlomwN+OjfOW0BTJbMl8hcwi0DkSBbuMp0B79uCKIsiBW2qRcCcBbvqBocDqBon2hR2Cidjw7TphBYcdZ0i3D/SaeEL6AuZPlIwnTleucjSfZXuHOQ9rmR+I4LPBhlRKFxdkYKEuycCFHwnRpvVziC+a+q/dVr0tuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641876967; 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=vMFt3XBPDETfNeIExPSRQ4EeHUsoyZRgvWyYmOkq4KQ=; b=BxHnX25KtNXVUmBgNvfwtSADs3081Dt/59JzpMU5f1q8RDqXFf7HamfYmKN7kQbJEeEwkTcm65tXOCXiUN+17utpcEQviO7pQIR4G8XHaFFVuTNSglHmP7j4vkt8mZ0FchXCqSuTH7tobCXjDYvgIeZp78G7xL/YhW6UPhznMMk= 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+85519+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 1641876967884149.26588570072636; Mon, 10 Jan 2022 20:56:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id q6wxYY1788612xImwffmciOG; Mon, 10 Jan 2022 20:56:07 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web08.3054.1641876966531731813 for ; Mon, 10 Jan 2022 20:56:06 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10223"; a="243355956" X-IronPort-AV: E=Sophos;i="5.88,279,1635231600"; d="scan'208";a="243355956" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2022 20:56:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,279,1635231600"; d="scan'208";a="474394668" X-Received: from shbiosbuild1001.sh.intel.com ([10.239.132.191]) by orsmga006.jf.intel.com with ESMTP; 10 Jan 2022 20:56:01 -0800 From: "Chen Lin Z" To: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, devel@edk2.groups.io Cc: zhuangzhi.li@intel.com, di.zhang@intel.com, "Chen, Lin Z" , Chen Subject: [edk2-devel] [PATCH] BaseTools: Fix wrong variable header size Date: Tue, 11 Jan 2022 13:01:12 +0000 Message-Id: <5e26f08910b67c693d37fd843fd32e429c6d2401.1641876123.git.lin.z.chen@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,lin.z.chen@intel.com X-Gm-Message-State: UKhSP5iZqLqdZkDf5Zqd8yRtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641876967; bh=u8B4L6pmq8Uq2NhnM4/JBB0FrKaFXVKT1H+kYc98J2c=; h=Cc:Date:From:Reply-To:Subject:To; b=d8DmvdIW06BDkCQ35t+RUczHBwYgHXOqr3jmbBGunOUYPK/maluui5XKXHEUt3OvFN9 7Xelc+xouw3MF6UpDIUEQ0pWkJDyDSf/lBpGfxIubzkAqlqMhr9ZMfXeddJD0jZm3gBKa IwcJ4kJvS7fBhvX9yRR99s0Z3yO/ezE0TG0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641876969107100002 Content-Type: text/plain; charset="utf-8" From: "Chen, Lin Z" There are two type variable header and their size are different, need to use matched size when calculating offset info, otherwise it'll destroy other variables content when patching. Signed-off-by: Chen, Lin Z Reviewed-by: Bob Feng --- BaseTools/Source/Python/AutoGen/GenVar.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/P= ython/AutoGen/GenVar.py index 3f3dc69e90..f2ad54ba63 100644 --- a/BaseTools/Source/Python/AutoGen/GenVar.py +++ b/BaseTools/Source/Python/AutoGen/GenVar.py @@ -20,6 +20,7 @@ import Common.GlobalData as GlobalData var_info =3D collections.namedtuple("uefi_var", "pcdindex,pcdname,defaults= toragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default= _value, default_value, data_type,PcdDscLine,StructurePcd") NvStorageHeaderSize =3D 28 VariableHeaderSize =3D 32 +AuthenticatedVariableHeaderSize =3D 60 =20 class VariableMgr(object): def __init__(self, DefaultStoreMap, SkuIdMap): @@ -171,7 +172,10 @@ class VariableMgr(object): DataBuffer =3D VariableMgr.AlignData(var_name_buffer + default= _data) =20 data_size =3D len(DataBuffer) - offset +=3D VariableHeaderSize + len(default_info.var_name.spl= it(",")) + if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTH= ENTICATED_VARIABLE_STORE,"FALSE").upper() =3D=3D "TRUE": + offset +=3D AuthenticatedVariableHeaderSize + len(default_= info.var_name.split(",")) + else: + offset +=3D VariableHeaderSize + len(default_info.var_name= .split(",")) var_data_offset[default_info.pcdindex] =3D offset offset +=3D data_size - len(default_info.var_name.split(",")) if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTH= ENTICATED_VARIABLE_STORE,"FALSE").upper() =3D=3D "TRUE": --=20 2.26.2.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 (#85519): https://edk2.groups.io/g/devel/message/85519 Mute This Topic: https://groups.io/mt/88342888/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-