From nobody Tue Feb 10 12:59:15 2026 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+73567+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+73567+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156992; cv=none; d=zohomail.com; s=zohoarc; b=UmEnfGL4S6N0ROnxyqAcGdKy/O0Vd73n02QIjdCw4WSBBHmOFZPb7G9r3XXwgTj+gR9sqnE0ivmPsoSB/XyerWw4+8L+UdXfn3NHBH8U8Du+VgLeYbE6w5Nuw716St9St0EBecU2DVLWQIv/JfOk2wYMu7mlmarUsXu1feKMGNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156992; 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=R4PUWncYUWcEnKI1BP1Xvs48Z4UcMYqg8TVpa5b3EKQ=; b=hZGxfPokzeTdXekwQFaW9tVNzGI8v9jbGh2DPyslW89W78RSJxM2Vv86AHIiQnR6GXlMY9MGA6ljFuv3RWtlSf4JoYpfEekWlOllg3AJ56FFk7NBtYssPz268IjE75YF6MiRB8tNMFNaumUi31g523PdyHfDYN185XpIrswmGxk= 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+73567+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156992823166.98014059730076; Tue, 30 Mar 2021 19:16:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hyH1YY1788612xLpLQpEKffq; Tue, 30 Mar 2021 19:16:32 -0700 X-Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by mx.groups.io with SMTP id smtpd.web12.1292.1617156991479806915 for ; Tue, 30 Mar 2021 19:16:31 -0700 X-Received: by mail-ot1-f45.google.com with SMTP id w31-20020a9d36220000b02901f2cbfc9743so17523132otb.7 for ; Tue, 30 Mar 2021 19:16:31 -0700 (PDT) X-Gm-Message-State: jkrxRGKBnErfRBKxNq7LBvB6x1787277AA= X-Google-Smtp-Source: ABdhPJy/33T6fx8L+Uj0szJE4uW/tIh4Dt/I5MuEe880jiYUiRlOCgM9h77p1evRCgJD6on2oaWRQw== X-Received: by 2002:a9d:921:: with SMTP id 30mr710339otp.49.1617156990609; Tue, 30 Mar 2021 19:16:30 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:30 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 4/5] ArmPkg: Fix calculation of offset of chassis SKU Number in SmbiosMiscDxe Date: Tue, 30 Mar 2021 20:16:18 -0600 Message-Id: <20210331021619.19761-5-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.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,rebecca@nuviainc.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=1617156992; bh=yc1EeoqwdT+NmT1UKqCxveuk2g0wBO63Q4G+ekPmvcE=; h=Cc:Date:From:Reply-To:Subject:To; b=n9jpkZEUdk5H6/UjnaeE/IBlSO4w8oVGyyehfn2eCYkASo8nbnR8z/qS3LUrs1KoL0G T7Za4H//fKc8/15jBgoF4AyJu6QJe8K7XVx0StYIMJ4Trvo1PXkQryZ4CAcT1D/pdvjh0 EludaAIATDaI7r4GGeuIzCf7F6Z/LYIyZqA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The calculation of the chassis SKU number field was being calculated incorrectly, forgetting that there's one element already present in the structure. Fix the calculation and improve code readability by introducing a SkuNumberField variable. Signed-off-by: Rebecca Cran --- ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFuncti= on.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufa= cturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassis= ManufacturerFunction.c index 344343ed60a5..66e3e5327fc3 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c @@ -39,6 +39,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) { CHAR8 *OptionalStrStart; CHAR8 *StrStart; + UINT8 *SkuNumberField; UINTN RecordLength; UINTN ManuStrLen; UINTN VerStrLen; @@ -117,10 +118,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) ChaNumStrLen =3D StrLen (ChassisSkuNumber); =20 ContainedElementCount =3D InputData->ContainedElementCount; - - if (ContainedElementCount > 1) { - ExtendLength =3D (ContainedElementCount - 1) * sizeof (CONTAINED_ELEME= NT); - } + ExtendLength =3D ContainedElementCount * sizeof (CONTAINED_ELEMENT); =20 // // Two zeros following the last string. @@ -149,7 +147,11 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) (VOID)CopyMem (SmbiosRecord + 1, &ContainedElements, ExtendLength); =20 //ChassisSkuNumber - *((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TABLE_TYPE3) + ExtendLength) = =3D 5; + SkuNumberField =3D (UINT8 *)SmbiosRecord + + sizeof (SMBIOS_TABLE_TYPE3) - + sizeof (CONTAINED_ELEMENT) + ExtendLength; + + *SkuNumberField =3D 5; =20 OptionalStrStart =3D (CHAR8 *)((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TA= BLE_TYPE3) + ExtendLength + 1); --=20 2.26.2 -=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 (#73567): https://edk2.groups.io/g/devel/message/73567 Mute This Topic: https://groups.io/mt/81741557/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-