From nobody Sun Dec 29 03:48:02 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1495119913429894.877216429016; Thu, 18 May 2017 08:05:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8E0EB2195FD79; Thu, 18 May 2017 08:04:51 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DF61921AEBAD3 for ; Thu, 18 May 2017 08:04:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C88551020; Thu, 18 May 2017 15:04:49 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-86.phx2.redhat.com [10.3.116.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id E523A7E5C9; Thu, 18 May 2017 15:04:47 +0000 (UTC) X-Original-To: edk2-devel@lists.01.org DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1C88551020 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1C88551020 From: Laszlo Ersek To: edk2-devel-01 Date: Thu, 18 May 2017 17:04:27 +0200 Message-Id: <20170518150427.16435-9-lersek@redhat.com> In-Reply-To: <20170518150427.16435-1-lersek@redhat.com> References: <20170518150427.16435-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 18 May 2017 15:04:49 +0000 (UTC) Subject: [edk2] [PATCH 8/8] Vlv2TbltDevicePkg/FvbRuntimeDxe: correct NumOfLba vararg type in EraseBlocks() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , David Wei MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" According to the PI spec, Volume 3, EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL.EraseBlocks(): > The variable argument list is a list of tuples. Each tuple describes a > range of LBAs to erase and consists of the following: > * An EFI_LBA that indicates the starting LBA > * A UINTN that indicates the number of blocks to erase (NB, in edk2, EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL is a typedef to EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL.) In this driver, the NumOfLba local variable is defined with type UINTN, but the TYPE argument passed to VA_ARG() is UINT32. Fix the mismatch. Cc: David Wei Cc: Jordan Justen Cc: Mang Guo Reported-by: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: zwei4 =20 --- Notes: unbuilt, untested Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c | 4 ++-- Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDeviceP= kg/FvbRuntimeDxe/FvbService.c index b0013f918368..89b941042420 100644 --- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c +++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c @@ -793,7 +793,7 @@ FvbProtocolEraseBlocks ( break; } =20 - NumOfLba =3D VA_ARG (args, UINT32); + NumOfLba =3D VA_ARG (args, UINTN); =20 // // Check input parameters. @@ -817,7 +817,7 @@ FvbProtocolEraseBlocks ( break; } =20 - NumOfLba =3D VA_ARG (args, UINT32); + NumOfLba =3D VA_ARG (args, UINTN); =20 while ( NumOfLba > 0 ) { Status =3D FvbEraseBlock (FvbDevice->Instance, StartingLba); diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c b/Vlv2TbltDevicePk= g/FvbRuntimeDxe/FvbSmmDxe.c index 20aaf8720f72..22a4bdcdd492 100644 --- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c +++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c @@ -725,7 +725,7 @@ FvbEraseBlocks ( break; } =20 - NumOfLba =3D VA_ARG (Marker, UINT32); + NumOfLba =3D VA_ARG (Marker, UINTN); if (NumOfLba =3D=3D 0) { return EFI_INVALID_PARAMETER; } @@ -742,7 +742,7 @@ FvbEraseBlocks ( if (StartingLba =3D=3D EFI_LBA_LIST_TERMINATOR ) { break; } - NumOfLba =3D VA_ARG (Marker, UINT32); + NumOfLba =3D VA_ARG (Marker, UINTN); Status =3D EraseBlock (This, StartingLba, NumOfLba); if (EFI_ERROR (Status)) { break; --=20 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel