From nobody Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47388+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47388+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749792; cv=none; d=zoho.com; s=zohoarc; b=lOAfeGzBUHvXCUKqmSQy3oMyleh+Ny8riLza7xu/e8YkflBvVWY5YzfherZv34YOpKW2DYXffXWAUfeGiRLrrwxuEeIj7JVXA4y2Gnj1K0CQ0vQDDPPpPe/98sdCRniGfSE7K9OE1DjRBOrZzT79ixlbczcACUzWI7Rx4S6odTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749792; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Uf/L8ZYIFP9iq67DiDIJYbqSzaFxN1e4XBhbE6p3m88=; b=SCPPe3dlsYVmH5H87s71f5bO/ZD1F6LZ3BKfSPKQlFYA1EjNxMiaLMx9xk1nu1b9vM5bw4yD9hTNU3TpHIGjzXsjDAq3FG4aDuq3P0f43oD5qILlK61gWhEkUzpQLaYRHjzjv1CP/ngU0PwqHOqXDG5Xb3yBNE2eEiTI/siOemw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47388+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749792554990.0705184642478; Tue, 17 Sep 2019 12:49:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id w9VfYY1788612xOylaJBNpDY; Tue, 17 Sep 2019 12:49:51 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:51 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4CF1F308FC4E; Tue, 17 Sep 2019 19:49:50 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DDE4600C8; Tue, 17 Sep 2019 19:49:44 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Achin Gupta , Andrew Fish , Anthony Perard , Ard Biesheuvel , Benjamin You , Chao Zhang , Dandan Bi , David Woodhouse , Eric Dong , Guo Dong , Hao A Wu , Jaben Carsey , Jian J Wang , Jiaxin Wu , Jiewen Yao , Jordan Justen , Julien Grall , Leif Lindholm , Liming Gao , Maurice Ma , Michael D Kinney , Ray Ni , Siyuan Fu , Supreeth Venkatesh , Zhichao Gao Subject: [edk2-devel] [PATCH 01/35] DO NOT APPLY: edk2: turn standard handle types into pointers to non-VOID Date: Tue, 17 Sep 2019 21:49:01 +0200 Message-Id: <20190917194935.24322-2-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 17 Sep 2019 19:49:50 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: QD8a2RqFuYsRUBwt5HCQzteox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749791; bh=ZoQIAGgCrZ0NEtIcpJEYRTCeQaLSvmD9ArqEIMQJV4o=; h=Cc:Date:From:Reply-To:Subject:To; b=doIOVTxG87ufSTUuOLKd2tLiJfzWNq5uj6Q62fH7y+xDueWfBtnxKVHucEfCJdUBZvJ v+XYOYBTGtsaS+sKq5luxHrjcCZKzmvI/j1OUE1XMSJlfcdIMgpF49pRPzSAWvnsdehEA YA4raQzDxhrKM26pOM4QEA3mnpjMNW+zoRM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Unfortunately, the UEFI / PI / Shell specs define a number of handle types as pointers to VOID. This is a design mistake; those types should have been pointers to incomplete union or structure types. Any pointer-to-object type converts implicitly to, and from, pointer-to-void, which prevents compilers from catching at least the following two types of mistakes: - mixing up one handle type with another (for example, EFI_HANDLE with EFI_EVENT), - getting the depth of indirection wrong (for example, mixing up (EFI_HANDLE*) with EFI_HANDLE). In order to root out such mistakes in the edk2 codebase, introduce incomplete structure types with unique tags, such as: struct EFI_FOOBAR_OBJECT; typedef struct EFI_FOOBAR_OBJECT *EFI_FOOBAR_HANDLE; replacing the spec mandated typedef VOID *EFI_FOOBAR_HANDLE; (For some types, such as: - EFI_ACPI_HANDLE, - EFI_EVENT, - EFI_FONT_HANDLE, - EFI_HANDLE, - EFI_HII_HANDLE, - EFI_S3_BOOT_SCRIPT_POSITION, - SHELL_FILE_HANDLE, we connect the actual complete type (the internal, implementation-specific type) to the typedef. Some of these also demonstrate how the code could have looked in practice if the specs had used proper opaque (=3Dincomplete) types.) Then, unleash "build" on the package DSC files. This causes the compiler to warn about incompatible pointer assignments, and to stop the build. The rest of the series addresses the resultant warnings. Each patch belongs in one of two categories: - semantic cleanups (no functional / behavioral changes), - actual bugfixes. As the subject line of this patch states, this specific patch is *not* meant to be applied. It is just a "what if" patch that temporarily isolates the standard types from each other, the way the specs should have, so that the compiler have more information to work with. Cc: Achin Gupta Cc: Andrew Fish Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Benjamin You Cc: Chao Zhang Cc: Dandan Bi Cc: David Woodhouse Cc: Eric Dong Cc: Guo Dong Cc: Hao A Wu Cc: Jaben Carsey Cc: Jian J Wang Cc: Jian Wang Cc: Jiaxin Wu Cc: Jiewen Yao Cc: Jordan Justen Cc: Julien Grall Cc: Leif Lindholm Cc: Liming Gao Cc: Maurice Ma Cc: Michael D Kinney Cc: Ray Ni Cc: Siyuan Fu Cc: Supreeth Venkatesh Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu --- MdePkg/Include/Pi/PiPeiCis.h | 6 ++++-- MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h | 3 ++- MdePkg/Include/Protocol/Bis.h | 3 ++- MdePkg/Include/Protocol/Eap.h | 3 ++- MdePkg/Include/Protocol/HiiFont.h | 3 +-- MdePkg/Include/Protocol/MmMp.h | 3 ++- MdePkg/Include/Protocol/S3SaveState.h | 2 +- MdePkg/Include/Protocol/Shell.h | 3 ++- MdePkg/Include/Protocol/UserManager.h | 9 ++++++--- MdePkg/Include/Uefi/UefiBaseType.h | 6 ++++-- MdePkg/Include/Uefi/UefiInternalFormRepresentation.h | 3 ++- MdeModulePkg/Core/Dxe/Event/Event.h | 2 +- MdeModulePkg/Core/Dxe/Hand/Handle.h | 2 +- MdeModulePkg/Core/PiSmmCore/PiSmmCore.h | 2 +- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h | 2 +- MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h | 2 +- StandaloneMmPkg/Core/StandaloneMmCore.h | 2 +- 17 files changed, 34 insertions(+), 22 deletions(-) diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h index d9d4ed7d413a..3e9e82b62ae9 100644 --- a/MdePkg/Include/Pi/PiPeiCis.h +++ b/MdePkg/Include/Pi/PiPeiCis.h @@ -18,12 +18,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// The handles of EFI FV. /// -typedef VOID *EFI_PEI_FV_HANDLE; +struct EFI_PEI_FV_OBJECT; +typedef struct EFI_PEI_FV_OBJECT *EFI_PEI_FV_HANDLE; =20 /// /// The handles of EFI FFS. /// -typedef VOID *EFI_PEI_FILE_HANDLE; +struct EFI_PEI_FILE_OBJECT; +typedef struct EFI_PEI_FILE_OBJECT *EFI_PEI_FILE_HANDLE; =20 /// /// Declare the forward reference data structure for EFI_PEI_SERVICE. diff --git a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h b/MdePkg/= Include/Protocol/AcpiSystemDescriptionTable.h index a8e0b24c6c8d..8a1863f3e03d 100644 --- a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h +++ b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h @@ -16,7 +16,8 @@ { 0xeb97088e, 0xcfdf, 0x49c6, { 0xbe, 0x4b, 0xd9, 0x6, 0xa5, 0xb2, 0xe, = 0x86 }} =20 typedef UINT32 EFI_ACPI_TABLE_VERSION; -typedef VOID *EFI_ACPI_HANDLE; +struct EFI_ACPI_OBJECT; +typedef struct EFI_ACPI_OBJECT *EFI_ACPI_HANDLE; =20 #define EFI_ACPI_TABLE_VERSION_NONE (1 << 0) #define EFI_ACPI_TABLE_VERSION_1_0B (1 << 1) diff --git a/MdePkg/Include/Protocol/Bis.h b/MdePkg/Include/Protocol/Bis.h index 2be6718f4bc2..8eca94512d03 100644 --- a/MdePkg/Include/Protocol/Bis.h +++ b/MdePkg/Include/Protocol/Bis.h @@ -37,7 +37,8 @@ typedef struct _EFI_BIS_PROTOCOL EFI_BIS_PROTOCOL; // // Basic types // -typedef VOID *BIS_APPLICATION_HANDLE; +struct BIS_APPLICATION_OBJECT; +typedef struct BIS_APPLICATION_OBJECT *BIS_APPLICATION_HANDLE; typedef UINT16 BIS_ALG_ID; typedef UINT32 BIS_CERT_ID; =20 diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h index 203d0f40b0dd..06584ef409d0 100644 --- a/MdePkg/Include/Protocol/Eap.h +++ b/MdePkg/Include/Protocol/Eap.h @@ -28,7 +28,8 @@ typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL; /// Type for the identification number assigned to the Port by the /// System in which the Port resides. /// -typedef VOID * EFI_PORT_HANDLE; +struct EFI_PORT_OBJECT; +typedef struct EFI_PORT_OBJECT *EFI_PORT_HANDLE; =20 /// /// EAP Authentication Method Type (RFC 3748) diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/Hi= iFont.h index 1f2e321ea4e2..450cad9ada70 100644 --- a/MdePkg/Include/Protocol/HiiFont.h +++ b/MdePkg/Include/Protocol/HiiFont.h @@ -19,8 +19,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0= x24 } } =20 typedef struct _EFI_HII_FONT_PROTOCOL EFI_HII_FONT_PROTOCOL; - -typedef VOID *EFI_FONT_HANDLE; +typedef LIST_ENTRY *EFI_FONT_HANDLE; =20 /// /// EFI_HII_OUT_FLAGS. diff --git a/MdePkg/Include/Protocol/MmMp.h b/MdePkg/Include/Protocol/MmMp.h index beace1386cbe..cd4e0db47e08 100644 --- a/MdePkg/Include/Protocol/MmMp.h +++ b/MdePkg/Include/Protocol/MmMp.h @@ -36,7 +36,8 @@ // // Completion token // -typedef VOID* MM_COMPLETION; +struct MM_COMPLETION_OBJECT; +typedef struct MM_COMPLETION_OBJECT* MM_COMPLETION; =20 typedef struct { MM_COMPLETION Completion; diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protoco= l/S3SaveState.h index c1b8f8b9e08d..235c36be6737 100644 --- a/MdePkg/Include/Protocol/S3SaveState.h +++ b/MdePkg/Include/Protocol/S3SaveState.h @@ -21,7 +21,7 @@ { 0xe857caf6, 0xc046, 0x45dc, { 0xbe, 0x3f, 0xee, 0x7, 0x65, 0xfb, 0xa= 8, 0x87 }} =20 =20 -typedef VOID *EFI_S3_BOOT_SCRIPT_POSITION; +typedef UINT8 *EFI_S3_BOOT_SCRIPT_POSITION; =20 typedef struct _EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SAVE_STATE_PROTOCOL; =20 diff --git a/MdePkg/Include/Protocol/Shell.h b/MdePkg/Include/Protocol/Shel= l.h index cfb7878228c5..bf791792b4f2 100644 --- a/MdePkg/Include/Protocol/Shell.h +++ b/MdePkg/Include/Protocol/Shell.h @@ -11,12 +11,13 @@ #define __EFI_SHELL_PROTOCOL_H__ =20 #include +#include =20 #define EFI_SHELL_PROTOCOL_GUID \ { \ 0x6302d008, 0x7f9b, 0x4f30, { 0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, = 0x4e } \ } -typedef VOID *SHELL_FILE_HANDLE; +typedef EFI_FILE_PROTOCOL *SHELL_FILE_HANDLE; =20 typedef enum { /// diff --git a/MdePkg/Include/Protocol/UserManager.h b/MdePkg/Include/Protoco= l/UserManager.h index 26ac4955f1ec..9abfcffbeebf 100644 --- a/MdePkg/Include/Protocol/UserManager.h +++ b/MdePkg/Include/Protocol/UserManager.h @@ -24,8 +24,10 @@ 0xbaf1e6de, 0x209e, 0x4adb, { 0x8d, 0x96, 0xfd, 0x8b, 0x71, 0xf3, 0xf6= , 0x83 } \ } =20 -typedef VOID *EFI_USER_PROFILE_HANDLE; -typedef VOID *EFI_USER_INFO_HANDLE; +struct EFI_USER_PROFILE_OBJECT; +typedef struct EFI_USER_PROFILE_OBJECT *EFI_USER_PROFILE_HANDLE; +struct EFI_USER_INFO_OBJECT; +typedef struct EFI_USER_INFO_OBJECT *EFI_USER_INFO_HANDLE; =20 /// /// The attributes of the user profile information. @@ -157,7 +159,8 @@ typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME; /// Biometric Exchange Formats Framework) specification. /// #define EFI_USER_INFO_CBEFF_RECORD 0x0B -typedef VOID *EFI_USER_INFO_CBEFF; +struct EFI_USER_INFO_CBEFF_OBJECT; +typedef struct EFI_USER_INFO_CBEFF_OBJECT *EFI_USER_INFO_CBEFF; /// /// Indicates how close of a match the fingerprint must be in order to be = considered a match. /// diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiB= aseType.h index a62f13dd064f..be5831991b52 100644 --- a/MdePkg/Include/Uefi/UefiBaseType.h +++ b/MdePkg/Include/Uefi/UefiBaseType.h @@ -28,11 +28,13 @@ typedef RETURN_STATUS EFI_STATUS; /// /// A collection of related interfaces. /// -typedef VOID *EFI_HANDLE; +struct EFI_OBJECT; +typedef struct EFI_OBJECT *EFI_HANDLE; /// /// Handle to an event structure. /// -typedef VOID *EFI_EVENT; +struct EFI_EVENT_OBJECT; +typedef struct EFI_EVENT_OBJECT *EFI_EVENT; /// /// Task priority level. /// diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/= Include/Uefi/UefiInternalFormRepresentation.h index 4a1346a599d0..93bf9e9e0f13 100644 --- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h +++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h @@ -20,7 +20,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// The following types are currently defined: /// -typedef VOID* EFI_HII_HANDLE; +struct EFI_HII_OBJECT; +typedef struct EFI_HII_OBJECT* EFI_HII_HANDLE; typedef CHAR16* EFI_STRING; typedef UINT16 EFI_IMAGE_ID; typedef UINT16 EFI_QUESTION_ID; diff --git a/MdeModulePkg/Core/Dxe/Event/Event.h b/MdeModulePkg/Core/Dxe/Ev= ent/Event.h index 8141c5003eec..42590cb1dd09 100644 --- a/MdeModulePkg/Core/Dxe/Event/Event.h +++ b/MdeModulePkg/Core/Dxe/Event/Event.h @@ -37,7 +37,7 @@ typedef struct { } TIMER_EVENT_INFO; =20 #define EVENT_SIGNATURE SIGNATURE_32('e','v','n','t') -typedef struct { +typedef struct EFI_EVENT_OBJECT { UINTN Signature; UINT32 Type; UINT32 SignalCount; diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.h b/MdeModulePkg/Core/Dxe/Ha= nd/Handle.h index 83eb2b9f3afe..1f1ab3274e8a 100644 --- a/MdeModulePkg/Core/Dxe/Hand/Handle.h +++ b/MdeModulePkg/Core/Dxe/Hand/Handle.h @@ -15,7 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// IHANDLE - contains a list of protocol handles /// -typedef struct { +typedef struct EFI_OBJECT { UINTN Signature; /// All handles list of IHANDLE LIST_ENTRY AllHandles; diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/Pi= SmmCore/PiSmmCore.h index 0908e7f4e9e7..c55da58d465e 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h @@ -145,7 +145,7 @@ typedef struct { /// /// IHANDLE - contains a list of protocol handles /// -typedef struct { +typedef struct EFI_OBJECT { UINTN Signature; /// All handles list of IHANDLE LIST_ENTRY AllHandles; diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModule= Pkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h index 50d4c96edb63..bfebbb1f8182 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h @@ -88,7 +88,7 @@ struct _EFI_AML_NODE_LIST { // This buffer should not be freed. // Size is the total size of this ACPI node buffer. // -typedef struct { +typedef struct EFI_ACPI_OBJECT { UINT32 Signature; UINT8 *Buffer; UINTN Size; diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModul= ePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index 4a3feab94df5..48972d0fcad6 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -274,7 +274,7 @@ typedef struct _HII_DATABASE_PACKAGE_LIST_INSTANCE { =20 #define HII_HANDLE_SIGNATURE SIGNATURE_32 ('h','i','h','l') =20 -typedef struct { +typedef struct EFI_HII_OBJECT { UINTN Signature; LIST_ENTRY Handle; UINTN Key; diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.h b/StandaloneMmPkg/Core= /StandaloneMmCore.h index 4d0eed273f50..dcf91bc5e916 100644 --- a/StandaloneMmPkg/Core/StandaloneMmCore.h +++ b/StandaloneMmPkg/Core/StandaloneMmCore.h @@ -105,7 +105,7 @@ typedef struct { /// /// IHANDLE - contains a list of protocol handles /// -typedef struct { +typedef struct EFI_OBJECT { UINTN Signature; /// All handles list of IHANDLE LIST_ENTRY AllHandles; --=20 2.19.1.3.g30247aa5d201 -=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 (#47388): https://edk2.groups.io/g/devel/message/47388 Mute This Topic: https://groups.io/mt/34180199/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47389+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47389+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749792; cv=none; d=zoho.com; s=zohoarc; b=HBRmTbpT52bqd10qrkmVz6JK8Sl0K5bWf8QLgFBFPeocjqoR4vNp0wfi5k/k0QbEYNGD70vTzyf4gwTdiWLk4Wl1JBl51kTc/ico8gJZ4RmKkaRzA760qcxZduYrs0pk1PhnYXdT1M6SnBtq0JLFwS/kDoHZroDRRtz658TQ/kQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749792; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=TPa5/+s7pBjzIMVHhwnBCdZC0s/JjSaXaX7mYhhYY6w=; b=ZKz2CtmR2ez8Bpje2PDFHm/JBn3ZBITsX5Mo/US5XrEdFX1Hz6ufo1OlOZxbDf+FX95B2VfVoXek2qb9Y1qgZ6YmozdYLjwjyGuH8QJM7eQmlQh7NXb00c9x1If63sGlic1vQt8s6GrgeTyeBLULYDd2QKw8OWlGXOWva1Bss3I= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47389+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749792967741.9446784009941; Tue, 17 Sep 2019 12:49:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9Pr3YY1788612x6twKpCv5pd; Tue, 17 Sep 2019 12:49:52 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:52 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B084F693C8; Tue, 17 Sep 2019 19:49:51 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id A744C600C4; Tue, 17 Sep 2019 19:49:50 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [PATCH 02/35] EmbeddedPkg: add missing EFIAPI calling convention specifiers Date: Tue, 17 Sep 2019 21:49:02 +0200 Message-Id: <20190917194935.24322-3-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 17 Sep 2019 19:49:51 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 88pohCbtVsnUbmDYzbphAGt7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749792; bh=vLq4jkjNtOoddpOovh9JG5VbuqKI0h7n+vBoUkSBUho=; h=Cc:Date:From:Reply-To:Subject:To; b=neeH1TY8i4V9y2KrJLExWl7HpZqdvN9cc0AfbH1xmq+Lc1jORWOG3/l4VCzN1bUVox9 YiWpN32ZUS4Jk5hZc2qpL4JffqUd9LFoSHIOQnzs4APFCTWJStY9bKuJmPgFahuWXUSqz 9TuyqUGgjfQQUwJF0N3RN2ns1DPfspJ0rrk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch is unrelated to the rest of the series; it just makes sure that "EmbeddedPkg/EmbeddedPkg.dsc" builds for all platforms advertised in SUPPORTED_ARCHITECTURES (in particular, X64). No functional changes. Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Leif Lindholm --- Notes: build-tested only EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h | 32 +++++++++++++= ++----- EmbeddedPkg/GdbStub/GdbStubInternal.h | 9 ++++++ EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 1 + EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c | 1 + EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 8 +++++ EmbeddedPkg/MetronomeDxe/Metronome.c | 1 + 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h b/EmbeddedPkg= /Drivers/SataSiI3132Dxe/SataSiI3132.h index e3db0821c38f..20636574c271 100644 --- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h +++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h @@ -205,7 +205,9 @@ SataSiI3132DriverBindingStop ( IN EFI_HANDLE *ChildHandleBuffer ); =20 -EFI_STATUS SiI3132AtaPassThruCommand ( +EFI_STATUS +EFIAPI +SiI3132AtaPassThruCommand ( IN SATA_SI3132_INSTANCE *pSataSiI3132Instance, IN SATA_SI3132_PORT *pSataPort, IN UINT16 PortMultiplierPort, @@ -216,7 +218,9 @@ EFI_STATUS SiI3132AtaPassThruCommand ( /** * EFI ATA Pass Thru Protocol */ -EFI_STATUS SiI3132AtaPassThru ( +EFI_STATUS +EFIAPI +SiI3132AtaPassThru ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort, @@ -224,37 +228,49 @@ EFI_STATUS SiI3132AtaPassThru ( IN EFI_EVENT Event OPTIONAL ); =20 -EFI_STATUS SiI3132GetNextPort ( +EFI_STATUS +EFIAPI +SiI3132GetNextPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN OUT UINT16 *Port ); =20 -EFI_STATUS SiI3132GetNextDevice ( +EFI_STATUS +EFIAPI +SiI3132GetNextDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN OUT UINT16 *PortMultiplierPort ); =20 -EFI_STATUS SiI3132BuildDevicePath ( +EFI_STATUS +EFIAPI +SiI3132BuildDevicePath ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort, IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); =20 -EFI_STATUS SiI3132GetDevice ( +EFI_STATUS +EFIAPI +SiI3132GetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, OUT UINT16 *Port, OUT UINT16 *PortMultiplierPort ); =20 -EFI_STATUS SiI3132ResetPort ( +EFI_STATUS +EFIAPI +SiI3132ResetPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port ); =20 -EFI_STATUS SiI3132ResetDevice ( +EFI_STATUS +EFIAPI +SiI3132ResetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort diff --git a/EmbeddedPkg/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/Gd= bStubInternal.h index b8346d7a545f..b08159302cfa 100644 --- a/EmbeddedPkg/GdbStub/GdbStubInternal.h +++ b/EmbeddedPkg/GdbStub/GdbStubInternal.h @@ -323,6 +323,7 @@ SendError ( Send 'OK' when the function is done executing successfully. **/ VOID +EFIAPI SendSuccess ( VOID ); @@ -332,6 +333,7 @@ SendSuccess ( Send empty packet to specify that particular command/functionality is not= supported. **/ VOID +EFIAPI SendNotSupported ( VOID ); @@ -353,6 +355,7 @@ ReadNthRegister ( @param SystemContext Register content at time of the except= ion **/ VOID +EFIAPI ReadGeneralRegisters ( IN EFI_SYSTEM_CONTEXT SystemContext ); @@ -364,6 +367,7 @@ ReadGeneralRegisters ( @param InBuffer This is the input buffer received from gdb= server **/ VOID +EFIAPI WriteNthRegister ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *InBuffer @@ -377,6 +381,7 @@ WriteNthRegister ( **/ =20 VOID +EFIAPI WriteGeneralRegisters ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *InBuffer @@ -391,6 +396,7 @@ WriteGeneralRegisters ( @param *PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI ReadFromMemory ( IN CHAR8 *PacketData ); @@ -404,6 +410,7 @@ ReadFromMemory ( @param PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI WriteToMemory ( IN CHAR8 *PacketData ); @@ -418,6 +425,7 @@ WriteToMemory ( **/ =20 VOID +EFIAPI ContinueAtAddress ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *PacketData @@ -432,6 +440,7 @@ ContinueAtAddress ( @param PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI SingleStep ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *PacketData diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c b/Embedded= Pkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c index c250844eda74..08bba1bbf111 100644 --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c @@ -174,6 +174,7 @@ RemoveSpcrTable ( =20 STATIC VOID +EFIAPI OnReadyToBoot ( IN EFI_EVENT Event, IN VOID *Context diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c b/EmbeddedPkg/Driv= ers/Lan9118Dxe/Lan9118Dxe.c index a0fca4d6a335..2138f7576bec 100644 --- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c +++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c @@ -34,6 +34,7 @@ LAN9118_DEVICE_PATH Lan9118PathTemplate =3D { ** */ EFI_STATUS +EFIAPI Lan9118DxeEntry ( IN EFI_HANDLE Handle, IN EFI_SYSTEM_TABLE *SystemTable diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Embe= ddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c index f6a723adfb28..0e2905c1ebb0 100644 --- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c +++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c @@ -39,6 +39,7 @@ GetSataDevice ( } =20 EFI_STATUS +EFIAPI SiI3132AtaPassThruCommand ( IN SATA_SI3132_INSTANCE *SataSiI3132Instance, IN SATA_SI3132_PORT *SataPort, @@ -310,6 +311,7 @@ SiI3132AtaPassThruCommand ( =20 **/ EFI_STATUS +EFIAPI SiI3132AtaPassThru ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -371,6 +373,7 @@ SiI3132AtaPassThru ( =20 **/ EFI_STATUS +EFIAPI SiI3132GetNextPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN OUT UINT16 *Port @@ -442,6 +445,7 @@ SiI3132GetNextPort ( =20 **/ EFI_STATUS +EFIAPI SiI3132GetNextDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -523,6 +527,7 @@ SiI3132GetNextDevice ( =20 **/ EFI_STATUS +EFIAPI SiI3132BuildDevicePath ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -601,6 +606,7 @@ SiI3132BuildDevicePath ( port number does not exist. **/ EFI_STATUS +EFIAPI SiI3132GetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, @@ -717,6 +723,7 @@ SiI3132HwResetPort ( =20 **/ EFI_STATUS +EFIAPI SiI3132ResetPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port @@ -772,6 +779,7 @@ SiI3132ResetPort ( =20 **/ EFI_STATUS +EFIAPI SiI3132ResetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, diff --git a/EmbeddedPkg/MetronomeDxe/Metronome.c b/EmbeddedPkg/MetronomeDx= e/Metronome.c index 579332169507..13db25168fac 100644 --- a/EmbeddedPkg/MetronomeDxe/Metronome.c +++ b/EmbeddedPkg/MetronomeDxe/Metronome.c @@ -110,6 +110,7 @@ EFI_HANDLE gMetronomeHandle =3D NULL; =20 **/ EFI_STATUS +EFIAPI MetronomeInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable --=20 2.19.1.3.g30247aa5d201 -=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 (#47389): https://edk2.groups.io/g/devel/message/47389 Mute This Topic: https://groups.io/mt/34180200/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47390+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47390+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749794; cv=none; d=zoho.com; s=zohoarc; b=GX2PC5+bJVYWSPkOT3m41fTe/+H2GnhbpdfmVaAnNHj8XG3V3uHOjiAu3KqcF/1zezVme5YdUk96ZJyf4luqufPKpHFdgmsceRBUlSPFEVDk4JjmQP0YYyPHTXXGBMbZ11aRzKatOhAmDL7S0Lz/iR/k+g+kpebYh19FAz5Hd+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749794; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=CSutxp/4LQ5MqbNXSurb7Nlbi55P9vYjysl6Mv2N6wc=; b=OqkqpbZACv93fT/Pk5YSZ4mMynz1zMC+fftbfJShY4/tH3S0RiXXvc4IjWYzlCS6dOhk2sikgL0Avwzjc7b9NmG32OL+Pbb5vtr5wIgP8VQ66RR9nE6mnrrQkcwCot/KYCs6hJBMnEvWKj2q5OaBg2HBPmmEMDWMqZqoPiXeceg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47390+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749794384445.5074465500144; Tue, 17 Sep 2019 12:49:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3UIKYY1788612xuZRyE5qMbD; Tue, 17 Sep 2019 12:49:53 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:53 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 242C4300CB26; Tue, 17 Sep 2019 19:49:53 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B0E3600C4; Tue, 17 Sep 2019 19:49:51 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [PATCH 03/35] EmbeddedPkg/AndroidFastbootTransportTcpDxe: fix DestroyChild() call Date: Tue, 17 Sep 2019 21:49:03 +0200 Message-Id: <20190917194935.24322-4-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 17 Sep 2019 19:49:53 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: pOVyyHcOslXcyo3ipgs9UZbux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749793; bh=u3TJNcQvqPtryJedrh5LVoKUuGAzUTxViNIk7pPR5x8=; h=Cc:Date:From:Reply-To:Subject:To; b=jQPZcjpo27Enu76rdzBPcU9XPMGObA+Ta7G8MGUVtEmuL5SgdCRldPNq9O2GreOzEct Jb0unctQd+tjR9AJAi7ZnOxKzkecl1W5/z6w4NVopkv6Ul2QtbLUBFgHRiUZ2NhQ9Sd9O JUOzFdMrjXVSQUeBmE0oYfivFftSd5jCeq8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" - The 2nd parameter of EFI_SERVICE_BINDING_CREATE_CHILD is: IN OUT EFI_HANDLE *ChildHandle - The 2nd parameter of EFI_SERVICE_BINDING_DESTROY_CHILD is: IN EFI_HANDLE ChildHandle Fix the DestroyChild() call in TcpFastbootTransportStop(). This is an actual bugfix; I don't know why the current code doesn't crash. Perhaps the function is never reached in practice? (It could be tied to an error path.) Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Laszlo Ersek Acked-by: Ard Biesheuvel Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c = | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTra= nsportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTr= ansportTcp.c index 29f23a82c75f..34f9ba74e4db 100644 --- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportT= cp.c +++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportT= cp.c @@ -503,7 +503,7 @@ TcpFastbootTransportStop ( Status =3D mTcpListener->Configure (mTcpListener, NULL); ASSERT_EFI_ERROR (Status); =20 - Status =3D mTcpServiceBinding->DestroyChild (mTcpServiceBinding, &mTcpHa= ndle); + Status =3D mTcpServiceBinding->DestroyChild (mTcpServiceBinding, mTcpHan= dle); =20 // Free any data the user didn't pick up Entry =3D (FASTBOOT_TCP_PACKET_LIST *) GetFirstNode (&mPacketListHead); --=20 2.19.1.3.g30247aa5d201 -=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 (#47390): https://edk2.groups.io/g/devel/message/47390 Mute This Topic: https://groups.io/mt/34180202/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47391+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47391+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749796; cv=none; d=zoho.com; s=zohoarc; b=aqEOlVZJqspxaXYxceeq8jeVlPbffjTeJgC1fh15POXIS4nv5E6LW1GHVEjUZ7r8Bbl2kZ6xyFpabYZwjBJ2X4f2ctkO+EYLnBwPyXyPmP0DUcVIiouoqQcKNiAtJZOlwyHMtHRm2r+kZTQ/ub+4tOqqF03zoStMxwTXqJf0es8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749796; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=g4/wF0Kgmb6HmteM3NAvLDhFWSIhxlCn9rP0I1FugVk=; b=hQPlkXAY52ULmg2a+l56pE2WxMckgquL7N1pa05ryNcbPJUVWZnM2WODfpZej703pXYYOg06xwkyae3aaYgpYx1sngxXhTSyyFHrZfA66dR6dMrD+uawA9S8fU23FCgpvy9PaA3oDfyiiIsPLbxd99D8ELm78XVPmvzkshwseEA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47391+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749796664928.5190825181608; Tue, 17 Sep 2019 12:49:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KohqYY1788612x8QAjmhwnBn; Tue, 17 Sep 2019 12:49:55 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:55 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C7363090FCD; Tue, 17 Sep 2019 19:49:54 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82BC7600C8; Tue, 17 Sep 2019 19:49:53 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [PATCH 04/35] EmbeddedPkg/Universal/MmcDxe: "fix" CloseProtocol() call in BindingStop() Date: Tue, 17 Sep 2019 21:49:04 +0200 Message-Id: <20190917194935.24322-5-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 17 Sep 2019 19:49:54 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: dQJlP3Gyv4fxdNKO5UpHdc5Ux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749795; bh=unOndOLlpBPELHh24XxBg2DcCSXHFafuOrByOAOy30A=; h=Cc:Date:From:Reply-To:Subject:To; b=qLdXRwG87eW0GE0Pd/V7VQwcTckOtCqAJvqv/i/tyVoJQDcIhmUfloSwNSJF3Ao80dg vd50IIKxEzAtj4LEVxdi2GLfa068nO2BuxOykLvxMXOhwYpnyYggNZA59Qa8feemUCZXK p2GgocooHbqrP8HbiQwMBSGsYuz46vmZZTU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The 3rd and 4th parameters of the CloseProtocol() call are wrong. Given that we're not dissociating a child controller from a parent controller (=3D closing a BY_CHILD_CONTROLLER open), but closing a BY_DRIVER open, the 4th parameter (ControllerHandle) should equal the 1st parameter (Handle). It's unclear why this code hasn't crashed before. Note that the patch doesn't fix the underlying driver model bug. I don't understand what the loop in MmcDriverBindingStop() attempts to do. Is this driver supposed to be a bus driver? It seems to create new handles, and to append device path nodes. But it doesn't set up proper parent/child protocol opens, and it doesn't close them. Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Laszlo Ersek Acked-by: Ard Biesheuvel Reviewed-by: Hao A Wu --- Notes: build-tested only EmbeddedPkg/Universal/MmcDxe/Mmc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/Mmc= Dxe/Mmc.c index 2f9ec9c7e7c1..c6170880debd 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c @@ -329,8 +329,9 @@ MmcDriverBindingStop ( // Close gEfiMmcHostProtocolGuid Status =3D gBS->CloseProtocol ( Controller, - &gEfiMmcHostProtocolGuid,(VOID **) &MmcHostInstance->MmcHo= st, - This->DriverBindingHandle + &gEfiMmcHostProtocolGuid, + This->DriverBindingHandle, + Controller ); =20 // Remove MMC Host Instance from the pool --=20 2.19.1.3.g30247aa5d201 -=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 (#47391): https://edk2.groups.io/g/devel/message/47391 Mute This Topic: https://groups.io/mt/34180203/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47392+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47392+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749797; cv=none; d=zoho.com; s=zohoarc; b=T3tf6mmp1hyud+cg0jbBM8lnl/hiYTxaE5i83nFmXzVuxlX82fFysqZ0WNV+PXb4H+GyjWTe974L4GeSGjB1q5V0lnWQKPgbZz8nYALSDtJ+rAZAet1qbCOHYGxWAjS9O6oHkoufZs7YgwEY+YdeEuYW7yqjeNqBdePjqBbRYoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749797; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=52gts74ReSVosfwW8H/a+672t6htkC4h0qw7NkEc/9c=; b=MFnX8L3zLKyAVHad3G0uUPYA5AMiZkuF2/EgpzaT5RINsG3jfLSNgtIHAolwiev5HjG8zmvD+l4aajxE6o1q7gisOObvKxOyXvZb4vg3Sip060PVfj9PCDxbQ0nyeoxgDgKb9tRJ1WtYmXgsJH3b0//Ju5azKyAyvrT+57rHAss= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47392+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749797537831.5332789051193; Tue, 17 Sep 2019 12:49:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HfrAYY1788612xmyKBJPDQVS; Tue, 17 Sep 2019 12:49:57 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:56 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 322C53090FCD; Tue, 17 Sep 2019 19:49:56 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9FDB600C4; Tue, 17 Sep 2019 19:49:54 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Andrew Fish , Jordan Justen , Ray Ni Subject: [edk2-devel] [PATCH 05/35] EmulatorPkg/DxeTimerLib: drop superfluous cast Date: Tue, 17 Sep 2019 21:49:05 +0200 Message-Id: <20190917194935.24322-6-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 17 Sep 2019 19:49:56 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: XwbJ8dQPUII7fZNro15j5L6Mx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749797; bh=+y68DKUcMKnS6bZM491Q0E7VfEinyuWv8x8dsi6t26Q=; h=Cc:Date:From:Reply-To:Subject:To; b=D0gqWf4Nt7rpAxHGSdFaxgYb3IJRRArMZmMIFfGH0G/fhmm/flWfowTv5PmWmxpLV9E 2u/H8BTA/QiI5Po8FFR8IskYhsM4yudvbKEprWx+q6jQxpWUKnkUlZGpCLl7IjGLzCF/g JvIf4RaBE2IHeyS0+OCS2B7r/V/3x5nEZVc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" "gTimerEvent" has type EFI_EVENT already, drop the superfluous cast. Cc: Andrew Fish Cc: Jordan Justen Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Ray Ni --- Notes: build-tested only EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c b/EmulatorPkg/Li= brary/DxeTimerLib/DxeTimerLib.c index 14cae4214c66..6fb5d8f3aaea 100644 --- a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c +++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c @@ -40,7 +40,7 @@ RegisterTimerArchProtocol ( gTimerPeriod =3D MultU64x32 (gTimerPeriod, 100); =20 if (gTimerEvent =3D=3D NULL) { - Status =3D gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, (VOID **)&gTi= merEvent); + Status =3D gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &gTimerEvent); ASSERT_EFI_ERROR (Status); } } --=20 2.19.1.3.g30247aa5d201 -=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 (#47392): https://edk2.groups.io/g/devel/message/47392 Mute This Topic: https://groups.io/mt/34180204/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47393+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47393+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749801; cv=none; d=zoho.com; s=zohoarc; b=PAp5zFTHeXrXNeAjNyGQNqSHuFYZdEU9lIkmQLgFTNdQlA6M54lxWvmrvDC6oL/DKXVBijnzieY2vkC+UgQ+beMbssxUYsRqwLp0wPXCjqRm2e9K4jTmoOngpiLiEqQes5WYNw1wHT5XU9p3OJjIiqv4ba27I3qasMHnov0czsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749801; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Jo3PJZjvBjmKGl+fHDC0GEkDUcp+WGCro24lU3W2/cc=; b=JG+mRybR7ldNRUpR+wrFkpFWZOq0Tpm4BvOJGX5kw0j7dP/Ypi1dok5KL/+eCNcGEugWn4vWgt0pMnhf8A6vCPn797yc10yUz+Sebo6nGBse6K6S+X8uOY8zZH2FAikpAW5SWFykr+utYVp1FdYEzIA6LYSp0Hryg2tL4Fv3lGM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47393+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749801860778.5874903384039; Tue, 17 Sep 2019 12:50:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YK1HYY1788612xIIQVcaOyyl; Tue, 17 Sep 2019 12:50:00 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:49:58 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC72E30821AE; Tue, 17 Sep 2019 19:49:57 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90BBC600C4; Tue, 17 Sep 2019 19:49:56 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Andrew Fish , Jordan Justen , Ray Ni Subject: [edk2-devel] [PATCH 06/35] EmulatorPkg: stop abusing EFI_HANDLE for keystroke notify registration Date: Tue, 17 Sep 2019 21:49:06 +0200 Message-Id: <20190917194935.24322-7-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 17 Sep 2019 19:49:57 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 8Nb4SIT8aHepwAYXi0qqSz2Nx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749800; bh=CjuAkXpybVuXXLF2Tgjxt5rzJ5bmaEFB0jYMSWy0uVc=; h=Cc:Date:From:Reply-To:Subject:To; b=do+HVtm75XdD9DAS6ssRw8DtWrKL5L4xjWlldN0ah2ua5tG+a+Qq73Y14jmPQ5qLqSm xAVrtCHZuDqTpUS753kcx5NYZZOT791Is3SftVFLKnP/0kdmL5tTnQ6X3a38LcFLk5V9L O2mYGOeFU/wB6E34/oqmOyMcmdKriK1G0nU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" EFI_REGISTER_KEYSTROKE_NOTIFY and EFI_UNREGISTER_KEYSTROKE_NOTIFY require the notification handle to have type (VOID*). The notification handle has nothing to do with the EFI_HANDLE type. This change is a semantic fix; functionally, it's a no-op. Cc: Andrew Fish Cc: Jordan Justen Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Ray Ni --- Notes: build-tested only EmulatorPkg/EmuGopDxe/GopInput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopIn= put.c index fdd0b4911555..2a23564a2173 100644 --- a/EmulatorPkg/EmuGopDxe/GopInput.c +++ b/EmulatorPkg/EmuGopDxe/GopInput.c @@ -517,7 +517,7 @@ EmuGopSimpleTextInExRegisterKeyNotify ( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, IN EFI_KEY_DATA *KeyData, IN EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, - OUT EFI_HANDLE *NotifyHandle + OUT VOID **NotifyHandle ) { EFI_STATUS Status; @@ -600,7 +600,7 @@ EFI_STATUS EFIAPI EmuGopSimpleTextInExUnregisterKeyNotify ( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, - IN EFI_HANDLE NotificationHandle + IN VOID *NotificationHandle ) /*++ =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47393): https://edk2.groups.io/g/devel/message/47393 Mute This Topic: https://groups.io/mt/34180205/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47394+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47394+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749801; cv=none; d=zoho.com; s=zohoarc; b=eNWOhheD4RMvLgWC76I4iR+8Sme48xYEXH7KbwHrk0SzSQayYCgUaVtaNPVFabf7JKutjt8+9TbkDYaSz4BJ6e0QCKazenOdk2GxZHiKU2I22YQi18tc7VOCe1GCL7EEt7KkT2XJj8FV4nIqyh7HJdRZdaUmOO9MZVWUW60IGO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749801; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=vTFjtlkNexHvU9TLluC+g2Nm4hW2dfkapKY48Wm3Dvo=; b=mwiizxThriM5foBjf0mbL/N9+6ZL/9WyGX+TkFggC1w571cfBx4uybnvedFqICPBT7ZhtQSjAH0M8Tx9a5Wzs+2MTJoe4I1hPbbdJW+VFyU6bnA4ERUmfkMdxyL2gft9DjmWVWYb4cgdbhNxdItXcMPwKVYeGTAAm+JnpGTXh2g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47394+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749801603391.12186822575745; Tue, 17 Sep 2019 12:50:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id RoEgYY1788612xY0Aw3DJetn; Tue, 17 Sep 2019 12:50:01 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:00 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 168343086211; Tue, 17 Sep 2019 19:50:00 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38210600C4; Tue, 17 Sep 2019 19:49:58 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Eric Dong , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni Subject: [edk2-devel] [PATCH 07/35] MdeModulePkg: fix cast in GetModuleInfoFromHandle() calls Date: Tue, 17 Sep 2019 21:49:07 +0200 Message-Id: <20190917194935.24322-8-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 17 Sep 2019 19:50:00 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: HeomWiA7ekMnlExsibCYmP1Ux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749801; bh=gwuL8EC420MCtkYt49CyOly6FyTljiKlZo6NZYBlYZY=; h=Cc:Date:From:Reply-To:Subject:To; b=h2L/qCyuQQXoXNX5w854vMs9mgKENZI5prwrxUQm3XFHQijeVxmNZGHwISW0qRktJlV s35zvyx40hjX2gbEjFFXE4NW2UhBPk7+W6gm+usIN0Yuylb+i4tvkArH8wGsTBp2xHvKo 0S6Kg7qRYQWfsz4cjonUqAkcaK8975ovyRE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" GetModuleInfoFromHandle() takes an EFI_HANDLE -- (VOID*) -- as first parameter, but InsertFpdtRecord() passes (EFI_HANDLE*) -- (VOID**). (VOID**) converts silently to (VOID*), which is why the wrong cast is masked. Note that the *value* that is passed is alright -- therefore this patch does not change behavior --, it's just semantically wrong to pass an (EFI_HANDLE*) where an EFI_HANDLE is expected. Cc: Dandan Bi Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: lightly tested, as DxeCorePerformanceLib is linked into ArmVirtQemu's DxeCore MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c | 12 ++= ++++------ MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c | 8 ++= ++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceL= ib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c index 0d507c445210..f500e20b320b 100644 --- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c +++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c @@ -998,7 +998,7 @@ InsertFpdtRecord ( switch (PerfId) { case MODULE_START_ID: case MODULE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; // // Cache the offset of start image start record and use to update the = start image end record if needed. @@ -1031,7 +1031,7 @@ InsertFpdtRecord ( =20 case MODULE_LOADIMAGE_START_ID: case MODULE_LOADIMAGE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; if (PerfId =3D=3D MODULE_LOADIMAGE_START_ID) { mLoadImageCount ++; @@ -1071,7 +1071,7 @@ InsertFpdtRecord ( case MODULE_DB_SUPPORT_END_ID: case MODULE_DB_STOP_START_ID: case MODULE_DB_STOP_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; if (!PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) { FpdtRecordPtr.GuidQwordEvent->Header.Type =3D FPDT_GUID_QW= ORD_EVENT_TYPE; @@ -1085,7 +1085,7 @@ InsertFpdtRecord ( break; =20 case MODULE_DB_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; if (!PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) { FpdtRecordPtr.GuidQwordStringEvent->Header.Type =3D FPDT_GUID_QW= ORD_STRING_EVENT_TYPE; @@ -1131,7 +1131,7 @@ InsertFpdtRecord ( case PERF_INMODULE_END_ID: case PERF_CROSSMODULE_START_ID: case PERF_CROSSMODULE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); if (String !=3D NULL) { StringPtr =3D String; } else { @@ -1153,7 +1153,7 @@ InsertFpdtRecord ( =20 default: if (Attribute !=3D PerfEntry) { - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName,= sizeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); if (String !=3D NULL) { StringPtr =3D String; } else { diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceL= ib.c b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c index 5f07464c4ec7..b4f22c14ae73 100644 --- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c +++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c @@ -587,7 +587,7 @@ InsertFpdtRecord ( switch (PerfId) { case MODULE_START_ID: case MODULE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; // // Cache the offset of start image start record and use to update the = start image end record if needed. @@ -612,7 +612,7 @@ InsertFpdtRecord ( =20 case MODULE_LOADIMAGE_START_ID: case MODULE_LOADIMAGE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); StringPtr =3D ModuleName; if (PerfId =3D=3D MODULE_LOADIMAGE_START_ID) { mLoadImageCount++; @@ -669,7 +669,7 @@ InsertFpdtRecord ( case PERF_INMODULE_END_ID: case PERF_CROSSMODULE_START_ID: case PERF_CROSSMODULE_END_ID: - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, siz= eof (ModuleName), &ModuleGuid); if (String !=3D NULL) { StringPtr =3D String; } else { @@ -691,7 +691,7 @@ InsertFpdtRecord ( =20 default: if (Attribute !=3D PerfEntry) { - GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName,= sizeof (ModuleName), &ModuleGuid); + GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, s= izeof (ModuleName), &ModuleGuid); if (String !=3D NULL) { StringPtr =3D String; } else { --=20 2.19.1.3.g30247aa5d201 -=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 (#47394): https://edk2.groups.io/g/devel/message/47394 Mute This Topic: https://groups.io/mt/34180207/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47395+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47395+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749803; cv=none; d=zoho.com; s=zohoarc; b=GsuLPyM9/eeafMdIKRLjPZZOSUvtKA3FPZznOhECctXqh6XAuZ0BUM5cAleNVrtp8E52VxWj9jbMRi9x/9EIGFa3ZSdbTLDYomgHLXUSf4CA31T/1utBfZIphPs+4O1sTV+RBKgNUHHQ0pnFAm0JNTQaPh4G7FXu+20qLf3rxFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749803; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=v5OxaxV7CWFdi58cvBbyaMxeOmui9kLv3Ej51ZwtuCM=; b=AEFoF3GYjscnqi4inDA/aGIJRlzr5TpqXV2JYRhfdLMwhgwmP+ZuLNTteqFnFlzqNTgq7I8vgJWIJeiP9u8PVh3eyFEZ0STYOrYWcgnFtl9Xuv+vPEl39sGG8Qs8J1uxHqm4W23uzTSKxnbWjKauO8nMxIKdHv/PI/LLJsKugyU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47395+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749803322220.7736761329071; Tue, 17 Sep 2019 12:50:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HBPsYY1788612xXZChQdPOr8; Tue, 17 Sep 2019 12:50:02 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:02 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8C6EC049E32; Tue, 17 Sep 2019 19:50:01 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73BD6600C4; Tue, 17 Sep 2019 19:50:00 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Eric Dong , Hao A Wu , Jian J Wang Subject: [edk2-devel] [PATCH 08/35] MdeModulePkg/UefiHiiLib: stop using EFI_HANDLE in place of EFI_HII_HANDLE Date: Tue, 17 Sep 2019 21:49:08 +0200 Message-Id: <20190917194935.24322-9-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 17 Sep 2019 19:50:02 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: zxqpaxRlcyjY8jNtMTyJY0Vnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749802; bh=3V1Wty6dg1AdAmOATTt0LvBcT4uFO6zHN6LALtBh/8s=; h=Cc:Date:From:Reply-To:Subject:To; b=vKPKmTWi688YLc11zP6kqtHWS2T5gjCTidPTjfJOLy+/eML+2jR+T3bzurf7NPQGhM+ uVvjayGE3LUPXJcV+gkZ4o0K1ngAhgBpK7K9tooVGw3IxkkDksT/X39yK51obKP/3w+d5 2EvyGM4T7n0yo7eLh9jSFIXv6eb3PCk4/qc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" HiiGetHiiHandles() returns an array of EFI_HII_HANDLEs, not EFI_HANDLEs. HiiGetString() takes an EFI_HII_HANDLE, not an EFI_HANDLE. This change is a no-op in practice; it's a semantic improvement. Cc: Dandan Bi Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: lightly tested, as UefiHiiLib is used by both ArmVirt and OVMF MdeModulePkg/Library/UefiHiiLib/HiiString.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Lib= rary/UefiHiiLib/HiiString.c index 498f245dce1f..95229f8a8c9f 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c @@ -173,8 +173,8 @@ HiiGetPackageString ( IN CONST CHAR8 *Language OPTIONAL ) { - EFI_HANDLE *HiiHandleBuffer; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE *HiiHandleBuffer; + EFI_HII_HANDLE HiiHandle; =20 ASSERT (PackageListGuid !=3D NULL); =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47395): https://edk2.groups.io/g/devel/message/47395 Mute This Topic: https://groups.io/mt/34180208/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47396+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47396+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749805; cv=none; d=zoho.com; s=zohoarc; b=iQgu9lYhe7F/MrjzJxkXAgYk0zwzjHwRavP0Dkmk0wLwgXmHeFjca7etcyWbXh7jmCMFoIVFB+T2NF4NBhRWr6rjaFh4mK6h4Ryly2uj5HPYlW4ioXAK6iWdGknSP4ormam+et++1nBX9vlx6SeonzToKhp2xayIzk3aLLcW1aU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749805; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2+MAxiKlhthaucRoyhqDa507Grbabz1lfGKJ4LBTCKA=; b=cJz8l2JZ7ZL2hZDDdy/YngXjETuy3BL865pzQTfbta5EsF58NhvCGrOebQroEW83++apf6ZZDeF36gPF8EBpx78cv9z3OfjRaVTA2ioC7gxnPZqVFzGmJGzjEIEwuDlqtLe+8wiKydwsBFEiyBA22C7K1Rb3XiBhHwPPGrUjB4Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47396+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749805926919.828407358938; Tue, 17 Sep 2019 12:50:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 28kEYY1788612xBEMqZptXyT; Tue, 17 Sep 2019 12:50:05 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:04 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 052F418CB8E1; Tue, 17 Sep 2019 19:50:04 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FD68600C4; Tue, 17 Sep 2019 19:50:02 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Hao A Wu , Jian J Wang , Liming Gao , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 09/35] MdeModulePkg: stop abusing EFI_EVENT for protocol notify registration Date: Tue, 17 Sep 2019 21:49:09 +0200 Message-Id: <20190917194935.24322-10-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 17 Sep 2019 19:50:04 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: kJus4KQvE7yowyeti9zyHCOBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749805; bh=R4Sgz0oBK+y1l+LOGX0B45QSPb0svlTZiTNCi8eVVII=; h=Cc:Date:From:Reply-To:Subject:To; b=dRbelbNG1w6sFcnxbzRiDfxJQSe12sA18KSVtWmVQYj8pBZ1U+KVBov2iR+iEDRG+vE TxjLqnN8AHDR6ujoDRDIJWIbzXd8w/dWVdb6Ryv064aNEB4KSKD4ZXVNH3shranCjxJ2r m8mEdymQ2J7ei3+8to2PExB13o9t/Fbom0I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" EfiCreateProtocolNotifyEvent() takes a (VOID**) for "Registration", similarly to gBS->RegisterProtocolNotify(). We should pass the address of an actual pointer-to-VOID, and not the address of an EFI_EVENT. EFI_EVENT just happens to be specified as (VOID*), and has nothing to do with the registration. The same applies to gMmst->MmRegisterProtocolNotify(). "mFtwRegistration", "mFvRegistration", and "mFvbRegistration" are used for nothing else. This change is a no-op in practice; it's a semantic improvement. Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Ray Ni --- Notes: lightly tested, as these modules (except LoadFileOnFv2) are part of the ArmVirt and/or OVMF platforms MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c | 2 +- MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c | 2 +- MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c | 2 +- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrit= eDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe= .c index ae8f117905cd..de38ea028af1 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c @@ -47,7 +47,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include #include "FaultTolerantWrite.h" -EFI_EVENT mFvbRegistration =3D NULL; +VOID *mFvbRegistration =3D NULL; =20 =20 /** diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrit= eSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm= .c index e8e935a85b5b..9612b394865b 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c @@ -56,7 +56,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "FaultTolerantWriteSmmCommon.h" #include =20 -EFI_EVENT mFvbRegistration =3D NULL; +VOID *mFvbRegistration =3D NULL; EFI_FTW_DEVICE *mFtwDevice =3D NULL; =20 /// diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c b/MdeModu= lePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c index 4af2da05e145..43fa6ce12875 100644 --- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c +++ b/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c @@ -36,7 +36,7 @@ typedef struct { #define LOAD_FILE_ON_FV2_PRIVATE_DATA_FROM_THIS(a) CR (a, LOAD_FILE_ON_FV2= _PRIVATE_DATA, LoadFile, LOAD_FILE_ON_FV2_PRIVATE_DATA_SIGNATURE) #define LOAD_FILE_ON_FV2_PRIVATE_DATA_FROM_LINK(a) CR (a, LOAD_FILE_ON_FV2= _PRIVATE_DATA, Link, LOAD_FILE_ON_FV2_PRIVATE_DATA_SIGNATURE) =20 -EFI_EVENT mFvRegistration; +VOID *mFvRegistration; LIST_ENTRY mPrivateDataList; =20 /** diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/Mde= ModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c index 3d232bb36cb4..7d2b6c8e1fad 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c @@ -13,7 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 EFI_HANDLE mHandle =3D NULL; EFI_EVENT mVirtualAddressChangeEvent =3D NULL; -EFI_EVENT mFtwRegistration =3D NULL; +VOID *mFtwRegistration =3D NULL; VOID ***mVarCheckAddressPointer =3D NULL; UINTN mVarCheckAddressPointerCount =3D 0; EDKII_VARIABLE_LOCK_PROTOCOL mVariableLock =3D { Varia= bleLockRequestToLock }; --=20 2.19.1.3.g30247aa5d201 -=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 (#47396): https://edk2.groups.io/g/devel/message/47396 Mute This Topic: https://groups.io/mt/34180210/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47397+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47397+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749807; cv=none; d=zoho.com; s=zohoarc; b=S69jlq4MToCU9HdOVW8C7QohdapvFt3stV8GKoUXCTEIN3yd8XAzjxPcbtKVqa9+gNJmwZTs34c49IWjj7IbLYlsFHg4VAg6WD4ITgSZoyNunDUy7Xc5XaHacfeWjnYWBu7zNEmdyiJG9q5LIV8bzdq688KYmJNL355dMCj5uvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=f4uOU77AhCBTmdGqZpgz+TjiJ4h7pjiBmHcxuwYhufQ=; b=mg8EZANThAKsGZNE+Vqu6+r6vi+TiMaRuoVMmOL9WsJV6mIRMEwKow7zEvRIlDjdRZnLQZhnGbjZXZ1lpToZqQ4QmxygqBWqbxeir9o/0JOhrue1KrDb7U1CO42mxwk/UyHQkbFJiVVBWculkPlDqMNLaucsFj7cZYrBHknkmtc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47397+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749807428350.0746216511427; Tue, 17 Sep 2019 12:50:07 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id A2ncYY1788612xkGr3mFri83; Tue, 17 Sep 2019 12:50:06 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:06 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3D5718CB8EB; Tue, 17 Sep 2019 19:50:05 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 603B8600C8; Tue, 17 Sep 2019 19:50:04 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Hao A Wu , Jian J Wang , Liming Gao Subject: [edk2-devel] [PATCH 10/35] MdeModulePkg/PlatformVarCleanupLib: fix HiiConstructConfigHdr() call Date: Tue, 17 Sep 2019 21:49:10 +0200 Message-Id: <20190917194935.24322-11-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 17 Sep 2019 19:50:05 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: SKtaDYBOOFHpiaOdvOqpm64px1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749806; bh=e+OpXegeKLLFL6tkXXJ9A9lgC+Q3Cs5CzxtDbFuF9Vw=; h=Cc:Date:From:Reply-To:Subject:To; b=n0OUT9og65Uuifuew8v1BUkJ2BATq+/oovKbD39Tho2sRu9P8GGH1440eg1AZ4h+57K Lucfyo+IT95MAqiBT20w3yXIuZ2rW0PIxlIvvr38R94a9O3O+zqKJPLQ2PmUqmS2lowDO z541ZiAfYkZc2QMUoNHunLNHcSEYuSZ47zA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The HiiConstructConfigHdr() function takes the "DriverHandle" parameter in order to fetch the device path from it, and then turn the device path into PATH routing information. The HiiConstructConfigHdr() function is called from VariableCleanupHiiExtractConfig(), which is only installed when "Type" is "VarCleanupManually" in PlatformVarCleanup(). In that case, we create "Private->DriverHandle" as a new handle, and install "mVarCleanupHiiVendorDevicePath" on it. Then we pass "Private->DriverHandle" to HiiAddPackages(), which consumes the device path for routing purposes. It follows that the "DriverHandle" argument pased to HiiConstructConfigHdr() should be the same driver handle, for matching routing. Currently we pass "Private->HiiHandle", which is clearly a typo, because it is the return value of HiiAddPackages(), and stands for the published HII package list. Therefore this patch addresses an actual bug. The typo has not been flagged by compilers because the UEFI spec regrettably defines both EFI_HANDLE and EFI_HII_HANDLE as (VOID*). Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c= b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c index 968c044a316a..3875d614bb41 100644 --- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c +++ b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c @@ -609,7 +609,11 @@ VariableCleanupHiiExtractConfig ( // Allocate and fill a buffer large enough to hold the tem= plate // followed by "&OFFSET=3D0&WIDTH=3DWWWWWWWWWWWWWWWW" followed by a Nu= ll-terminator. // - ConfigRequestHdr =3D HiiConstructConfigHdr (&mVariableCleanupHiiGuid, = mVarStoreName, Private->HiiHandle); + ConfigRequestHdr =3D HiiConstructConfigHdr ( + &mVariableCleanupHiiGuid, + mVarStoreName, + Private->DriverHandle + ); Size =3D (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); ConfigRequest =3D AllocateZeroPool (Size); ASSERT (ConfigRequest !=3D NULL); --=20 2.19.1.3.g30247aa5d201 -=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 (#47397): https://edk2.groups.io/g/devel/message/47397 Mute This Topic: https://groups.io/mt/34180211/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47398+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47398+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749808; cv=none; d=zoho.com; s=zohoarc; b=VmiZjlB0LKJ2IJuUjedfmY+4uptRwNbUpXXzPGoTfGI5AHBSwUio7NEQkr/HqNpnXxI/+OyNAE8jdWM/aBpWv7uwml9EQoANK8TXgMxTVy0g46i/2B0u8HeeJJAgzSVFTzfN7Jo0g9Y/i7zn5M0AyLB8K2PAqh3aW1ZYx8Su1R8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749808; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2lhBGKYOAYTHRbjuNcs0ViMzYzn5zuxvtQFNL5jFxiI=; b=dJX4UxpK7F5+8ehoQ0Byoj4ekaZsvJpvCEE6ofBcUebQTC037wo7QOWUdvqgBCHR8qzJYInSKn/knsW4oQew3ts8YfUtsp9AUwFbJadGvzVjLyw1bkyzaKuUBT1CkMfrDLdtbVAJTbb96h9+Xer4ENlQGzkcBrBzK5f0NABBrcw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47398+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156874980875848.41371905735309; Tue, 17 Sep 2019 12:50:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JVngYY1788612xJCeEivKNZP; Tue, 17 Sep 2019 12:50:08 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:07 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A0BA368DA; Tue, 17 Sep 2019 19:50:07 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0885B600C4; Tue, 17 Sep 2019 19:50:05 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Hao A Wu , Jian J Wang , Liming Gao Subject: [edk2-devel] [PATCH 11/35] MdeModulePkg: document workaround for EFI_RUNTIME_EVENT_ENTRY PI spec bug Date: Tue, 17 Sep 2019 21:49:11 +0200 Message-Id: <20190917194935.24322-12-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 17 Sep 2019 19:50:07 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 2V4c0oPRFyij7ohR8WlPpWoRx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749808; bh=gbBOj9/04CrASuaR37J8P1QxLKoBoK27/h0hgtjEJIo=; h=Cc:Date:From:Reply-To:Subject:To; b=fweqN9dfyQ5S96gTtFuKv/AmIPR7VZaHwGCxpAyklRab0vKtH8q8OsRuuksTVKk0v2z KqRXMvyyQkKUenremqohKOYclQbigGq46/nr5Ysc3MFBd//r5kG3KBEkUfxe+8vYlkiCq uMNFGhp0NRDJPd/AcXMynUVp3nn9rjMnp34= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The PI spec (v1.7) correctly specifies "EFI_RUNTIME_EVENT_ENTRY.Event" in natural language, but the field type in the structure definition itself is wrong -- it should be EFI_EVENT, not (EFI_EVENT*). This spec bug is likely unfixable for compatibility reasons, and so edk2 works it around already. We should clearly document the workaround. Functionally, this patch is a no-op. (I've also requested a non-normative (informative) clarification for the PI spec: .) Cc: Dandan Bi Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu --- Notes: lightly tested, as these modules are part of the ArmVirt and/or OVMF platforms MdeModulePkg/Core/Dxe/Event/Event.c | 8 ++++++++ MdeModulePkg/Core/RuntimeDxe/Runtime.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Core/Dxe/Event/Event.c b/MdeModulePkg/Core/Dxe/Ev= ent/Event.c index 21db38aaf037..c83c572c8f84 100644 --- a/MdeModulePkg/Core/Dxe/Event/Event.c +++ b/MdeModulePkg/Core/Dxe/Event/Event.c @@ -485,6 +485,14 @@ CoreCreateEventInternal ( IEvent->RuntimeData.NotifyTpl =3D NotifyTpl; IEvent->RuntimeData.NotifyFunction =3D NotifyFunction; IEvent->RuntimeData.NotifyContext =3D (VOID *) NotifyContext; + // + // Work around the bug in the Platform Init specification (v1.7), repo= rted + // as Mantis#2017: "EFI_RUNTIME_EVENT_ENTRY.Event" should have type + // EFI_EVENT, not (EFI_EVENT*). The PI spec documents the field correc= tly + // as "The EFI_EVENT returned by CreateEvent()", but the type of the f= ield + // doesn't match the natural language description. Therefore we need an + // explicit cast here. + // IEvent->RuntimeData.Event =3D (EFI_EVENT *) IEvent; InsertTailList (&gRuntime->EventHead, &IEvent->RuntimeData.Link); } diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/Run= timeDxe/Runtime.c index c52b2b7ecf68..f7220a205d1e 100644 --- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c +++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c @@ -285,8 +285,16 @@ RuntimeDriverSetVirtualAddressMap ( for (Link =3D mRuntime.EventHead.ForwardLink; Link !=3D &mRuntime.EventH= ead; Link =3D Link->ForwardLink) { RuntimeEvent =3D BASE_CR (Link, EFI_RUNTIME_EVENT_ENTRY, Link); if ((RuntimeEvent->Type & EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) =3D=3D EV= T_SIGNAL_VIRTUAL_ADDRESS_CHANGE) { + // + // Work around the bug in the Platform Init specification (v1.7), + // reported as Mantis#2017: "EFI_RUNTIME_EVENT_ENTRY.Event" should h= ave + // type EFI_EVENT, not (EFI_EVENT*). The PI spec documents the field + // correctly as "The EFI_EVENT returned by CreateEvent()", but the t= ype + // of the field doesn't match the natural language description. Ther= efore + // we need an explicit cast here. + // RuntimeEvent->NotifyFunction ( - RuntimeEvent->Event, + (EFI_EVENT) RuntimeEvent->Event, RuntimeEvent->NotifyContext ); } --=20 2.19.1.3.g30247aa5d201 -=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 (#47398): https://edk2.groups.io/g/devel/message/47398 Mute This Topic: https://groups.io/mt/34180212/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47399+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47399+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749810; cv=none; d=zoho.com; s=zohoarc; b=FBwd2tqv41X026RUurQbLh6p0CsNoyEegm3gMaNwWV68SyocO0Le7f3F33YmYcZCiSQxlaaBmhjVQoIVmL/PsWuswaF4fDfSX3xWIjno9dt9n2Zf+GNLAeM0MVlp8zCO1/Zd/9G1Z4FuoWVPq2XmENozw64l3tht1B0rB9GLyhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749810; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=4LaBziHNhI3TSO+QzYIPzomZSMIY02N7LzlbpvkpoVA=; b=Y8xq62UV/eSLHatk9YDahjdcv9JiUThh9n82UvckR7ev6fWBTusAoth6q13k1fDH+GkYmwGMnR+RlbhIk2aQOujMGyOppl6wK1SOPR9CMWKgrOwnUXczhzGu+CrUpsa33NBkdeYTCc/4VVdmOxZgbB1uKOFtXlkdS3Khpb+CTWY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47399+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749810971907.9370122460733; Tue, 17 Sep 2019 12:50:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WPXZYY1788612xDQUWwR8hpQ; Tue, 17 Sep 2019 12:50:10 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:10 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6B478A1C90; Tue, 17 Sep 2019 19:50:09 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8D71600C4; Tue, 17 Sep 2019 19:50:07 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Eric Dong , Hao A Wu , Jian J Wang , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 12/35] MdeModulePkg: stop abusing EFI_HANDLE for keystroke notify registration Date: Tue, 17 Sep 2019 21:49:12 +0200 Message-Id: <20190917194935.24322-13-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 17 Sep 2019 19:50:09 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: UBdkVHtc8N3BWXrf91k6RlREx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749810; bh=lkPgrKDUJPnPRe4DcJR0iQR3aqyvhGGVvD2sZ9w06Fs=; h=Cc:Date:From:Reply-To:Subject:To; b=nLNIevd2qD2YfO3swSnXdy9GydwTlIy3PdPKtR0adCSV/r+Cx8+QximjtyNBwiAuz/O kaQWgi0KY2dKVR7+w7u0mlN48+9UoC6bW4TElYyZnK4NIHYPPmOoUd5pXZgo29mtEr8s0 +ZFKYXaziPt7msQEQymgE/gyfSbXIbKb90A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" EFI_REGISTER_KEYSTROKE_NOTIFY and EFI_UNREGISTER_KEYSTROKE_NOTIFY require the notification handle to have type (VOID*). The notification handle has nothing to do with the EFI_HANDLE type. This change is a semantic fix; functionally, it's a no-op. Cc: Dandan Bi Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Ray Ni --- Notes: lightly tested: ConSplitterDxe is part of the ArmVirt and OVMF platforms MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c | 2 +- MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 63c814ae1816..9c38271b65f9 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -4026,7 +4026,7 @@ ConSplitterTextInRegisterKeyNotify ( if (NewNotify =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; } - NewNotify->NotifyHandleList =3D (EFI_HANDLE *) AllocateZeroPool (sizeof = (EFI_HANDLE) * Private->TextInExListCount); + NewNotify->NotifyHandleList =3D (VOID **) AllocateZeroPool (sizeof (VOID= *) * Private->TextInExListCount); if (NewNotify->NotifyHandleList =3D=3D NULL) { gBS->FreePool (NewNotify); return EFI_OUT_OF_RESOURCES; diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeMod= ulePkg/Universal/DriverSampleDxe/DriverSample.c index 7cfd5c178861..f98797225b63 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c @@ -143,7 +143,7 @@ InternalStartMonitor( EFI_HANDLE *Handles; UINTN HandleCount; UINTN HandleIndex; - EFI_HANDLE NotifyHandle; + VOID *NotifyHandle; =20 Status =3D gBS->LocateHandleBuffer ( ByProtocol, @@ -202,7 +202,7 @@ InternalStopMonitor( EFI_KEY_DATA KeyData; UINTN HandleCount; UINTN HandleIndex; - EFI_HANDLE NotifyHandle; + VOID *NotifyHandle; =20 Status =3D gBS->LocateHandleBuffer ( ByProtocol, --=20 2.19.1.3.g30247aa5d201 -=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 (#47399): https://edk2.groups.io/g/devel/message/47399 Mute This Topic: https://groups.io/mt/34180213/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47400+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47400+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749813; cv=none; d=zoho.com; s=zohoarc; b=cmUS67i3sgQ24FFGtvP9yg9CHdpqXN5njn6jiZASunwsOeS9kQoE+YM89xFF8Vrr3CL6SbZPDs8Nxe0agtG1nIUHUG5IwPfe6xKKXzSjnaDZW1xij63bMz2b6mMj7q/1y7fwWeFtaiTnD/lmdMBCvOkGJ/o8SGv6tYm/4p056Jk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749813; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=BAvQ8xEhiy56jmw2J7y50sScmRFtQ71rWuwlDd3k7SA=; b=EMKHuKsnnNdtWex7oLGqDTZcQdKtbskOrbDJlFxf8+X30Y6ZL1hdhsO62HpRkc6U95PdEj0WnzywvYn63nHARNEaO8TC/zdsuIjvrVlAhtqmc1+ekcO4+Bphw9DM9zCSlp4wJd8KIWAqbbtmyr2NNadTshsOQbmtvYostINasTY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47400+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156874981327471.74050853674817; Tue, 17 Sep 2019 12:50:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uOUgYY1788612xMfSDib81ZR; Tue, 17 Sep 2019 12:50:12 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:11 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94975308FC4A; Tue, 17 Sep 2019 19:50:11 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21394600C4; Tue, 17 Sep 2019 19:50:09 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Hao A Wu , Jian J Wang , Liming Gao Subject: [edk2-devel] [PATCH 13/35] MdeModulePkg: PEI Core: clean up "AprioriFile" handling in FindFileEx() Date: Tue, 17 Sep 2019 21:49:13 +0200 Message-Id: <20190917194935.24322-14-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 17 Sep 2019 19:50:11 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: SO7D0vzLGlznbDEM4z96Rqcvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749812; bh=l8sW39fRMf/1D1pAW+NkEkUjSh2xdHPlRfbbwELDzSk=; h=Cc:Date:From:Reply-To:Subject:To; b=hjsojw1qcTaAq3ipuJfNSxh3TRDxYCTpBg9m5G+74WvBBWo9uzafT4Tq4iAr8t/33yc k2p79y2oVi+qI68eXMKL8OdzBYJWIY7kl/iIt1H4k/rQRKTOpgEnGoPzy9WUlCnXOyRXq rKbKYxE5gvTj2BRfPHte9OUAPkehMMZQpgA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Clean up two issues around FindFileEx(): - The "AprioriFile" parameter's type differs between the function declaration and the function definition. The correct type is (EFI_PEI_FILE_HANDLE*). - "FfsFileHeader" has type (EFI_FFS_FILE_HEADER*); for clarity, we should cast it explicitly to EFI_PEI_FILE_HANDLE when assigning it to (*AprioriFile). This is a semantic cleanup, there is no functional change. Cc: Dandan Bi Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: lightly tested: OVMF uses APRIORI PEI in the FDF files MdeModulePkg/Core/Pei/FwVol/FwVol.h | 2 +- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h b/MdeModulePkg/Core/Pei/Fw= Vol/FwVol.h index 4082cfbec1f8..ca80e84e0fcb 100644 --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.h +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.h @@ -299,7 +299,7 @@ FindFileEx ( IN CONST EFI_GUID *FileName, OPTIONAL IN EFI_FV_FILETYPE SearchType, IN OUT EFI_PEI_FILE_HANDLE *FileHandle, - IN OUT EFI_PEI_FV_HANDLE *AprioriFile OPTIONAL + IN OUT EFI_PEI_FILE_HANDLE *AprioriFile OPTIONAL ); =20 /** diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/Fw= Vol/FwVol.c index 709db00694c2..f4642c47c13a 100644 --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c @@ -407,7 +407,7 @@ FindFileEx ( } else if (AprioriFile !=3D NULL) { if (FfsFileHeader->Type =3D=3D EFI_FV_FILETYPE_FREEFORM) { if (CompareGuid (&FfsFileHeader->Name, &gPeiAprioriFileNameGui= d)) { - *AprioriFile =3D FfsFileHeader; + *AprioriFile =3D (EFI_PEI_FILE_HANDLE)FfsFileHeader; } } } --=20 2.19.1.3.g30247aa5d201 -=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 (#47400): https://edk2.groups.io/g/devel/message/47400 Mute This Topic: https://groups.io/mt/34180214/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47401+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47401+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749815; cv=none; d=zoho.com; s=zohoarc; b=hgZsKEAm6lh66tnWuf2JW6eWh/k7zIRwnR2OaH6ynJt9K7eZFLm1LW3hbeT/lNUc8ptYE/Qfa/xPBtvtaegxKjWUw4unEHhVgCDwuB3QOdoqBN/O3FNS0ulzGROKNzawA5yKE89SGlAFYLzL2cdrewSAc+9brTT/umdPjona8Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749815; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=cMXvn781Io3xe5HIAYSlw9u6uihPYhCLQmNSYNhqjd0=; b=X/pE4Z1FQGJeeafurWrXwYKdW2ZlRDapF6ctniUPeEA5THloxC8GMiUtadE+mkjImDkggcjDZdotSyFozobmwG/Nv5ps497odtq0R/rErRMB5OeBTfZSeLy1STR9l+c7HAk6RVdUWEh+mM1osVoGC4yg1jbBuin3BfBbXJc4SOQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47401+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156874981505957.53802287915062; Tue, 17 Sep 2019 12:50:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jIekYY1788612x5bo9ej7j7T; Tue, 17 Sep 2019 12:50:14 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:13 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B72F1918645; Tue, 17 Sep 2019 19:50:13 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id F12E4600C8; Tue, 17 Sep 2019 19:50:11 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Hao A Wu , Jian J Wang , Ray Ni Subject: [edk2-devel] [PATCH 14/35] MdeModulePkg: fix UninstallMultipleProtocolInterfaces() calls Date: Tue, 17 Sep 2019 21:49:14 +0200 Message-Id: <20190917194935.24322-15-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 17 Sep 2019 19:50:13 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 4fVyiRWJs1WxARUd2ffkhBsvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749814; bh=QCigjJU47PqIn7gPjVO3YSRJXhgU1BfyG1v4B4YcMzY=; h=Cc:Date:From:Reply-To:Subject:To; b=XSh8RRcHssI7hsgL08rR/EgvR6gDYpeB1sv9BT47cajNRTI9V0589quECS6tpJNiE08 QA4rE21XmiYbpD5/ENSab0cycW8DrFx7nQyrUtVpLBN4FQA7YF/zSJUQxi3498Uk/s2/J zfg7kkdcHfMYVSXUjKyLtQLqxj3pJGReDDE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Unlike the InstallMultipleProtocolInterfaces() boot service, which takes an (EFI_HANDLE*) as first parameter, the UninstallMultipleProtocolInterfaces() boot service takes an EFI_HANDLE as first parameter. These are actual bugs. They must have remained hidden until now because they are on error paths. Fix the UninstallMultipleProtocolInterfaces() calls. Cc: Hao A Wu Cc: Jian J Wang Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Ray Ni --- Notes: build-tested only MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c | 2 +- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c | 2 +- MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c | 6 +++--- MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c | 2 +- MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c | 2 +- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c | 2 +- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/MdeModulePkg/Bus/I2c/I2= cDxe/I2cBus.c index 2b54ec51dca0..ed33a51da252 100644 --- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c +++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c @@ -720,7 +720,7 @@ Error: =20 if (I2cBusContext !=3D NULL) { Status =3D gBS->UninstallMultipleProtocolInterfaces ( - &Controller, + Controller, gEfiCallerIdGuid, I2cBusContext, NULL diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c b/MdeModulePkg= /Bus/Pci/NvmExpressDxe/NvmExpress.c index c6e401176a4b..3bde96bc9576 100644 --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c @@ -244,7 +244,7 @@ EnumerateNvmeDevNamespace ( ); if(EFI_ERROR(Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &Device->DeviceHandle, + Device->DeviceHandle, &gEfiDevicePathProtocolGuid, Device->DevicePath, &gEfiBlockIoProtocolGuid, diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModuleP= kg/Bus/Pci/PciBusDxe/PciDeviceSupport.c index b7832c6970ad..292dd25da817 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c @@ -313,7 +313,7 @@ RegisterPciDevice ( ); if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &PciIoDevice->Handle, + PciIoDevice->Handle, &gEfiDevicePathProtocolGuid, PciIoDevice->DevicePath, &gEfiPciIoProtocolGuid, @@ -351,7 +351,7 @@ RegisterPciDevice ( ); if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &PciIoDevice->Handle, + PciIoDevice->Handle, &gEfiDevicePathProtocolGuid, PciIoDevice->DevicePath, &gEfiPciIoProtocolGuid, @@ -360,7 +360,7 @@ RegisterPciDevice ( ); if (HasEfiImage) { gBS->UninstallMultipleProtocolInterfaces ( - &PciIoDevice->Handle, + PciIoDevice->Handle, &gEfiLoadFile2ProtocolGuid, &PciIoDevice->LoadFile2, NULL diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c b/MdeModulePkg/B= us/Pci/PciSioSerialDxe/Serial.c index 82db93a8b117..9fe8a482e067 100644 --- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c +++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c @@ -665,7 +665,7 @@ CreateSerialDevice ( =20 if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &SerialDevice->Handle, + SerialDevice->Handle, &gEfiDevicePathProtocolGuid, SerialDevice->DevicePath, &gEfiSerialIoProtocolGuid, &SerialDevice->SerialIo, NULL diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c b/MdeModulePkg/Bus/Sd/Em= mcDxe/EmmcDxe.c index 62f18d1878bd..e2ae56c5058a 100644 --- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c +++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c @@ -475,7 +475,7 @@ InstallProtocolOnPartition ( ); if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &Partition->Handle, + Partition->Handle, &gEfiDevicePathProtocolGuid, Partition->DevicePath, &gEfiBlockIoProtocolGuid, diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/= Usb/UsbBusDxe/UsbEnumer.c index eaa0d70024bb..cc0de52de411 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c @@ -159,7 +159,7 @@ UsbCreateInterface ( =20 if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - &UsbIf->Handle, + UsbIf->Handle, &gEfiDevicePathProtocolGuid, UsbIf->DevicePath, &gEfiUsbIoProtocolGuid, diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModu= lePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c index 8c27e18cdb87..0dcbc5da2cb8 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c @@ -575,7 +575,7 @@ UsbMassInitMultiLun ( if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: OpenUsbIoProtocol By Chil= d (%r)\n", Status)); gBS->UninstallMultipleProtocolInterfaces ( - &UsbMass->Controller, + UsbMass->Controller, &gEfiDevicePathProtocolGuid, UsbMass->DevicePath, &gEfiBlockIoProtocolGuid, --=20 2.19.1.3.g30247aa5d201 -=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 (#47401): https://edk2.groups.io/g/devel/message/47401 Mute This Topic: https://groups.io/mt/34180215/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47402+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47402+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749816; cv=none; d=zoho.com; s=zohoarc; b=QVqRLicmSUmp/FXdxquqpmMG5FqAA6qOb9ji+7pr2b6B04n4Fv+UZLwZ0U1HdcA+WMihrRxRkmxpOKgfE6Og7gVcnCGArY/pb/9J8DPj4QMFPv6handnLqkbeB61WZffChmZ7+uHYT2XzpMo/KeE0TgmlWyHnb1fV3zpgXMIyaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749816; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hf0chMZZLGRviwgh4MPyuQWnLp+EZM0qKKKSaT/GfJc=; b=LlGR5kK2jNFYsldczoy+NZHmcNC8xUgTHtlCjVecFDBwnxrPvVq20Eyg5al5FDqcytaFu9VI5joqXEWMD6LCwb/1eYRTgLpNN70lagz3f/J18k73/uFMcguFaKS6jPYgjJf5iP6oRQdGyyau5sD7FseLR6w2g/oswkkKFXHh7pE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47402+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749816330716.8925251553641; Tue, 17 Sep 2019 12:50:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id TFwPYY1788612xOI85rednIJ; Tue, 17 Sep 2019 12:50:15 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:15 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1250237E88; Tue, 17 Sep 2019 19:50:15 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99ADA600C4; Tue, 17 Sep 2019 19:50:13 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Eric Dong , Hao A Wu , Jian J Wang , Ray Ni Subject: [edk2-devel] [PATCH 15/35] MdeModulePkg/PiSmmCore: make type punning consistent Date: Tue, 17 Sep 2019 21:49:15 +0200 Message-Id: <20190917194935.24322-16-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 17 Sep 2019 19:50:15 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: aXv5U1EjE9JuhpvpKzKY6bzKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749815; bh=SUuKpHAhqTS8B02SVgZwKlJnsVZIcV0+mKxxFu1HoNg=; h=Cc:Date:From:Reply-To:Subject:To; b=w8Y51Ikpa6YDHQsNw6NyBBguHpLzqN/Ijs+SQFs4gUjpqBgNML7HU3v1CGOQMtmZAND aeo5hE0/0PF7numkPM6+0AwglfEQI6ClBd5K1S+bskNWzU/JLuWlkbic8OwfvdEkRAtPO ax8xtZd38QvJDMO+19rDcVM6IXHx74uJDGs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The SmiHandlerRegister() function explicitly casts "SmiHandler" (of type (SMI_HANDLER*)) to EFI_HANDLE, when outputting "DispatchHandle". Apply the same cast in the counterpart function SmiHandlerUnRegister(), which compares multiple "SmiHandler"s against the input "DispatchHandle". This is a semantic cleanup; there is no functional change. Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Eric Dong Reviewed-by: Hao A Wu --- Notes: build-tested only, most likely -- I'm unaware of any code paths in OVMF that would lead to SmiHandlerUnRegister() MdeModulePkg/Core/PiSmmCore/Smi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCor= e/Smi.c index f8bd9f49ee3c..488af6754faf 100644 --- a/MdeModulePkg/Core/PiSmmCore/Smi.c +++ b/MdeModulePkg/Core/PiSmmCore/Smi.c @@ -282,7 +282,7 @@ SmiHandlerUnRegister ( // SmiHandler =3D NULL; for ( HandlerLink =3D GetFirstNode (&mRootSmiEntry.SmiHandlers) - ; !IsNull (&mRootSmiEntry.SmiHandlers, HandlerLink) && (SmiHandler != =3D DispatchHandle) + ; !IsNull (&mRootSmiEntry.SmiHandlers, HandlerLink) && ((EFI_HANDLE)= SmiHandler !=3D DispatchHandle) ; HandlerLink =3D GetNextNode (&mRootSmiEntry.SmiHandlers, HandlerLi= nk) ) { SmiHandler =3D CR (HandlerLink, SMI_HANDLER, Link, SMI_HANDLER_SIGNATU= RE); @@ -292,19 +292,19 @@ SmiHandlerUnRegister ( // Look for it in non-root SMI handlers // for ( EntryLink =3D GetFirstNode (&mSmiEntryList) - ; !IsNull (&mSmiEntryList, EntryLink) && (SmiHandler !=3D DispatchHa= ndle) + ; !IsNull (&mSmiEntryList, EntryLink) && ((EFI_HANDLE) SmiHandler != =3D DispatchHandle) ; EntryLink =3D GetNextNode (&mSmiEntryList, EntryLink) ) { SmiEntry =3D CR (EntryLink, SMI_ENTRY, AllEntries, SMI_ENTRY_SIGNATURE= ); for ( HandlerLink =3D GetFirstNode (&SmiEntry->SmiHandlers) - ; !IsNull (&SmiEntry->SmiHandlers, HandlerLink) && (SmiHandler != =3D DispatchHandle) + ; !IsNull (&SmiEntry->SmiHandlers, HandlerLink) && ((EFI_HANDLE) S= miHandler !=3D DispatchHandle) ; HandlerLink =3D GetNextNode (&SmiEntry->SmiHandlers, HandlerLink) ) { SmiHandler =3D CR (HandlerLink, SMI_HANDLER, Link, SMI_HANDLER_SIGNA= TURE); } } =20 - if (SmiHandler !=3D DispatchHandle) { + if ((EFI_HANDLE) SmiHandler !=3D DispatchHandle) { return EFI_INVALID_PARAMETER; } =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47402): https://edk2.groups.io/g/devel/message/47402 Mute This Topic: https://groups.io/mt/34180216/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47403+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47403+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749818; cv=none; d=zoho.com; s=zohoarc; b=NBCTZReSQ35C27/CZ6ZRx/Pr57UMgnMxnM9vtO8pae5CFwh3BGMOwxcV6G+xtS0Blcx/hOblQ3ZpA/QC44ato0aHQC5/Ww4f7lV9lnxgcn7g6y7cvsHDOABSrFJLNeGz1OJ01lGGkBdJq7UX9gNJ/7GXdhdtqCvAHN+Hbxhiu1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749818; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=NGK3P9+wE09crGCUDF1Opo1PRn3IPZwRMfpPp7scCiM=; b=e9MuUf/1AFZ52bDFz1pX1vA8UTDWnpTzZ+DLzqm93NA6xjJMJ2J7NS7zu/4gIwuDlIdrSIZylGO3h1G+xnJBumzwMv//cMuVw7dboVh2E5jfHdWPw3C180SZetFdKyX8us8h4NvqDjTP3jN6twhyuN01XZ1oL5QIDoAuD/MmZYA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47403+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749818630888.3475353750613; Tue, 17 Sep 2019 12:50:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id g3JJYY1788612xRZ1uJQykyF; Tue, 17 Sep 2019 12:50:18 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:17 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 528E981F10; Tue, 17 Sep 2019 19:50:17 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70458600C4; Tue, 17 Sep 2019 19:50:15 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Eric Dong , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni Subject: [edk2-devel] [PATCH 16/35] MdeModulePkg/S3SaveState: cast Position for S3BootScriptLib explicitly Date: Tue, 17 Sep 2019 21:49:16 +0200 Message-Id: <20190917194935.24322-17-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 17 Sep 2019 19:50:17 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: lz0hLyHRVECFZzoMGwJgYRgBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749818; bh=UOhqLdymkZR0IiR8TonqrxLg0ds1HVbznmevwyPK+sY=; h=Cc:Date:From:Reply-To:Subject:To; b=i4ib1DJY6y1TEd3m0WwegaMcG/1sEdYWmqPV2Wb30LdDo2h4a01AKEEZ5656FDMIumu 5Y5SejFAwlcb/xiVjBoEH8Nl2gDLUjMoG2nO92zYLHh4UkFc/KUFBDctJmVeVpoh5mSz+ eboVgRyGt/BAPTMJ8d9pPKtov6qwTXtBz5g= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The BootScriptInsert() and BootScriptLabel() functions take the in/out parameter "Position" as (EFI_S3_BOOT_SCRIPT_POSITION*), and pass it to S3BootScriptMoveLastOpcode() and S3BootScriptLabel(), respectively. The callees take the in/out parameter "Position" as (VOID**). Add explicit casts for clarity. There is no change in functionality. Cc: Dandan Bi Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi Reviewed-by: Hao A Wu --- Notes: lightly tested: multiple drivers in OVMF write S3 boot script fragments MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c | 4 ++-- MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/Mde= ModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c index e94d15772d78..cfa8ebbd2f5d 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c @@ -810,7 +810,7 @@ BootScriptInsert ( } =20 if (!EFI_ERROR (Status)) { - Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); + Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position= ); } return Status; } @@ -851,7 +851,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Lab= el); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Posi= tion, Label); } /** Compare two positions in the boot script table and return their relative= position. diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/= MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c index 9637df4fb82a..fc6d29e48ba9 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c @@ -808,7 +808,7 @@ BootScriptInsert ( } =20 if (!EFI_ERROR (Status)) { - Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); + Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position= ); } return Status; } @@ -849,7 +849,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Lab= el); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Posi= tion, Label); } /** Compare two positions in the boot script table and return their relative= position. --=20 2.19.1.3.g30247aa5d201 -=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 (#47403): https://edk2.groups.io/g/devel/message/47403 Mute This Topic: https://groups.io/mt/34180217/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47404+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47404+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749819; cv=none; d=zoho.com; s=zohoarc; b=HhAwHZPH2lxH72y0TBaX7vPmTQ8f0wr9Y3SVpE0VIQOpTrCXMRrCpTcKwWg+z5zzuxGtCgJncjcaPWqqtygHhOyZYMLcf3aUWId34bRKPkeuzYCxQxdRBAQ4/ov9NRKgT3oy7cZkw8ZwMrdVGPIChR9z5Q/BNbcMX3KCE3Y6uCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749819; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=UZateVkf9bileYJ+0yO4BaWWv/CVLhtzjLvxaMBfr/4=; b=ZVvycvXItwmbBSGUNM/uYQoh1zHFGZx2y/KR6BvGYp1rNfBy4Kfsp3uref3RLEZPNB1y7bY3uEBpiapkWKK/pfXZPzyAPa4n0C5MljdMZpY8vaYVyObjs7SA87tT7HkGAdWjtn4SwipKrKrm/WVNmgJxkbDFnJwjxNoykkoqxlw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47404+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749819975608.6321300283539; Tue, 17 Sep 2019 12:50:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FG7XYY1788612xMnq4Qw3tWn; Tue, 17 Sep 2019 12:50:19 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:19 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD8C710F2E81; Tue, 17 Sep 2019 19:50:18 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0AA7600C4; Tue, 17 Sep 2019 19:50:17 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Liming Gao , Michael D Kinney Subject: [edk2-devel] [PATCH 17/35] MdePkg/DxeServicesLib: remove bogus cast Date: Tue, 17 Sep 2019 21:49:17 +0200 Message-Id: <20190917194935.24322-18-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 17 Sep 2019 19:50:18 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: MZKbD56lSzkoENcXRRwsALfSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749819; bh=AU5fm1QpCjXuWz3NNuTG0SaZxkZ5MZDdzup7KeKa880=; h=Cc:Date:From:Reply-To:Subject:To; b=gQMwT26MUGTvKOBvfMGuN70BHQ/nUP+jm6ykRrDy4MCeX1KkaqVWkH+iakUPZm2Bg4z I9sPGXx5gMZanh0UZsUTMNZxVurT91/8Dg7YBr4zqTSQqPkvXmGF2Mz1q6Z12EzIAOJj+ ejz3P3TlTX/4GwPFdfqtnw5xbEU2XWDvc1k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The HandleProtocol() boot service takes an EFI_HANDLE, not an (EFI_HANDLE*). Remove the bogus cast in the InternalImageHandleToFvHandle() function. This is a semantic cleanup; there is no change in behavior. Cc: Liming Gao Cc: Michael D Kinney Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Liming Gao Reviewed-by: Philippe Mathieu-Daude --- Notes: lightly tested, most probably: it's practically impossible to build a platform without consuming DxeServicesLib MdePkg/Library/DxeServicesLib/DxeServicesLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c b/MdePkg/Librar= y/DxeServicesLib/DxeServicesLib.c index c416b2dd8c65..0735b2f80400 100644 --- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c +++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c @@ -49,7 +49,7 @@ InternalImageHandleToFvHandle ( ASSERT (ImageHandle !=3D NULL); =20 Status =3D gBS->HandleProtocol ( - (EFI_HANDLE *) ImageHandle, + ImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &LoadedImage ); --=20 2.19.1.3.g30247aa5d201 -=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 (#47404): https://edk2.groups.io/g/devel/message/47404 Mute This Topic: https://groups.io/mt/34180218/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47405+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47405+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749821; cv=none; d=zoho.com; s=zohoarc; b=cj4lB/LrqabO3Dz6tu2IaOIB0reRKc6vdgtHHQ+JaANlDFtQ6AaAPS8j8xNePVnGiO/YotLa2Q4wdo7faReZdceDqsewQCzzs5ctkSvA+wgjlKwcuHfGFLzBtWakKZEGT6b/hWT1LN5VykNQZOszZY08/6dJrBw6E4qHpUnxmi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749821; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=gofdJeXW2RRfQZodmYNLS8ackApePI2ceLshvObzDl0=; b=c0rkZixqzTG3RSIRdwgKOVBHmo7s481/Mka4AOunm2zPVhS5FLHTxyLFFeuCtdWl3KX3nNH6LO+T1VFYURmPJuy9TTZnA5pyxDoG0dhfbU0ZDXdPDr6ipCDnsK4phY0UcYUNfGSQNMatBKubFpuJq0sL7WpvWWp19V07C4LWUpQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47405+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749821532502.5163631770056; Tue, 17 Sep 2019 12:50:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VkAbYY1788612xssAf2LHtYK; Tue, 17 Sep 2019 12:50:21 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:20 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30CA618C426E; Tue, 17 Sep 2019 19:50:20 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25FFA600C4; Tue, 17 Sep 2019 19:50:18 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH 18/35] NetworkPkg/DxeNetLib: fix type typo in NetLibGetMacAddress() Date: Tue, 17 Sep 2019 21:49:18 +0200 Message-Id: <20190917194935.24322-19-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 17 Sep 2019 19:50:20 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: o7TdCuLrlECsCZ4nSjkuNv5hx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749821; bh=RnpReZpcVFwoa0cdHFPls/caqU3vuIzp0QCRolcIYNc=; h=Cc:Date:From:Reply-To:Subject:To; b=R4a2KGwvQkAnmoZsir06GHVVtQZzNGHtXMtxX/36/JGfsxkRvWyJkrhp2OQQeNdlGDJ 9tbJeyf8ElLNlrTs/FhqrVvKKJqchcVPXr5qlxG+lMu5qALwCUFKFKv4BtpbVPJGU85t2 oeffCQ+SrfVUGuDgYbSS6W0/h+SwmUZNcJQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" NetLibGetSnpHandle() returns an EFI_HANDLE, not an (EFI_HANDLE*). NetLibGetMacAddress() only uses the return value ("SnpHandle") for a NULL-check. Fix the type of "SnpHandle". This patch is a no-op. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Michael D Kinney Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Siyuan Fu --- Notes: lightly tested: MAC strings are displayed in UiApp NetworkPkg/Library/DxeNetLib/DxeNetLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkPkg/Library/DxeNetLib/DxeNetLib.c b/NetworkPkg/Library/= DxeNetLib/DxeNetLib.c index 8e2f720666ea..a39c20be3d34 100644 --- a/NetworkPkg/Library/DxeNetLib/DxeNetLib.c +++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.c @@ -2182,7 +2182,7 @@ NetLibGetMacAddress ( EFI_SIMPLE_NETWORK_MODE SnpModeData; EFI_MANAGED_NETWORK_PROTOCOL *Mnp; EFI_SERVICE_BINDING_PROTOCOL *MnpSb; - EFI_HANDLE *SnpHandle; + EFI_HANDLE SnpHandle; EFI_HANDLE MnpChildHandle; =20 ASSERT (MacAddress !=3D NULL); --=20 2.19.1.3.g30247aa5d201 -=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 (#47405): https://edk2.groups.io/g/devel/message/47405 Mute This Topic: https://groups.io/mt/34180219/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47406+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47406+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749823; cv=none; d=zoho.com; s=zohoarc; b=e+W4O/D9MZDgyTLTYy0Q2tBQ2bgs/bTzb2DWp4nOT1O4Izo/Iybp/QPcgnKKfrXJWl7qJegnq0lYKUmkKvfW2z0HmsUfe36SH3Q8CseDFCm0LB4qC4Toh++L3tcXzPiKR4sUatppCHZWbPfJc2wkHcL8qEO7ai+KDLYpAPpY0vg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749823; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=/fsZpQ3lQvbjg1Oj3pdfoASRaRK2/gS1Td8cmutD8ps=; b=aBniX8riletU1B6pP/zT06uFoIwOa+WnlUnQ14KtCAncsEMAiH7wrCZcfPKhx54trFZOz/UsRNOpgc1ahuzOhWt/OatBAS0qyZC8YIPsvW2HgQmpVDtaBjaSXIKZNBhe2aF0RDTbPplXXFi72UuDFo8RsrWtKed9ugfFfRMUSCA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47406+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749823403455.23546044078785; Tue, 17 Sep 2019 12:50:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8rXCYY1788612xR4wg4CABlV; Tue, 17 Sep 2019 12:50:22 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:22 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98A1E3082A6C; Tue, 17 Sep 2019 19:50:21 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D27C600C4; Tue, 17 Sep 2019 19:50:20 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH 19/35] NetworkPkg: fix CloseProtocol & UninstallMultipleProtocolInterfaces calls Date: Tue, 17 Sep 2019 21:49:19 +0200 Message-Id: <20190917194935.24322-20-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 17 Sep 2019 19:50:21 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: wSmqBbo1aSjG57fEdpdFLUnBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749822; bh=u1Ff9whyN/ISGmrjzr1tDGcpTjtxWN2lj1SIx7hVxIM=; h=Cc:Date:From:Reply-To:Subject:To; b=kWfbdHvfqFnAUxd07Fm2JE8di8iCQBMqFZLAI9caDeCE0XTOb28mGZGiaIbofSOHRU9 rTQJRbugPA8RN47QiBisaC+q8QO3GB7HxYAePCGtKQL6zhT+vxW/Q1e+xTZwnn7tF7YdM a1/J6267u5WAH3uqwrwiMS8+ffQ8qUDe5io= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Both the "ControllerHandle" parameter of CloseProtocol() and the "Handle" parameter of UninstallMultipleProtocolInterfaces() have type EFI_HANDLE, not (EFI_HANDLE*). This patch fixes actual bugs. The issues have been dormant likely because they are on error paths. (Or, in case of TlsAuthConfigDxe, because the driver is unloaded likely very infrequently.) Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Siyuan Fu --- Notes: build-tested only NetworkPkg/DnsDxe/DnsDriver.c | 4 ++-- NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +- NetworkPkg/Ip4Dxe/Ip4Driver.c | 2 +- NetworkPkg/Ip6Dxe/Ip6Driver.c | 2 +- NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c | 2 +- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c index 94d072159a4d..ad007da8b7d6 100644 --- a/NetworkPkg/DnsDxe/DnsDriver.c +++ b/NetworkPkg/DnsDxe/DnsDriver.c @@ -1145,7 +1145,7 @@ Dns4ServiceBindingCreateChild ( DnsSb->ConnectUdp->UdpHandle, &gEfiUdp4ProtocolGuid, gDns4DriverBinding.DriverBindingHandle, - ChildHandle + *ChildHandle ); =20 gBS->UninstallMultipleProtocolInterfaces ( @@ -1388,7 +1388,7 @@ Dns6ServiceBindingCreateChild ( DnsSb->ConnectUdp->UdpHandle, &gEfiUdp6ProtocolGuid, gDns6DriverBinding.DriverBindingHandle, - ChildHandle + *ChildHandle ); =20 gBS->UninstallMultipleProtocolInterfaces ( diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiC= onfig.c index b876da7f5ccd..d773849fd3b0 100644 --- a/NetworkPkg/IScsiDxe/IScsiConfig.c +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c @@ -3852,7 +3852,7 @@ IScsiConfigFormInit ( ); if (CallbackInfo->RegisteredHandle =3D=3D NULL) { gBS->UninstallMultipleProtocolInterfaces ( - &CallbackInfo->DriverHandle, + CallbackInfo->DriverHandle, &gEfiDevicePathProtocolGuid, &mIScsiHiiVendorDevicePath, &gEfiHiiConfigAccessProtocolGuid, diff --git a/NetworkPkg/Ip4Dxe/Ip4Driver.c b/NetworkPkg/Ip4Dxe/Ip4Driver.c index ebd4dec1dfe4..62be8b681a18 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Driver.c +++ b/NetworkPkg/Ip4Dxe/Ip4Driver.c @@ -891,7 +891,7 @@ Ip4ServiceBindingCreateChild ( ); if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - ChildHandle, + *ChildHandle, &gEfiIp4ProtocolGuid, &IpInstance->Ip4Proto, NULL diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c index 7dc9e45af7b6..63d8428dbced 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Driver.c +++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c @@ -888,7 +888,7 @@ Ip6ServiceBindingCreateChild ( ); if (EFI_ERROR (Status)) { gBS->UninstallMultipleProtocolInterfaces ( - ChildHandle, + *ChildHandle, &gEfiIp6ProtocolGuid, &IpInstance->Ip6Proto, NULL diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c b/NetworkPkg/Mtftp4Dxe/Mtf= tp4Driver.c index ae9e65544a86..06c4e202d3ef 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c @@ -592,7 +592,7 @@ Mtftp4ServiceBindingCreateChild ( MtftpSb->ConnectUdp->UdpHandle, &gEfiUdp4ProtocolGuid, gMtftp4DriverBinding.DriverBindingHandle, - ChildHandle + *ChildHandle ); goto ON_ERROR; } diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.c b/NetworkPkg/Tl= sAuthConfigDxe/TlsAuthConfigDxe.c index 18ee763002b4..c0870ab9979c 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.c @@ -39,7 +39,7 @@ TlsAuthConfigDxeUnload ( ASSERT (PrivateData->Signature =3D=3D TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNA= TURE); =20 gBS->UninstallMultipleProtocolInterfaces ( - &ImageHandle, + ImageHandle, &gEfiCallerIdGuid, PrivateData, NULL --=20 2.19.1.3.g30247aa5d201 -=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 (#47406): https://edk2.groups.io/g/devel/message/47406 Mute This Topic: https://groups.io/mt/34180220/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47407+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47407+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749824; cv=none; d=zoho.com; s=zohoarc; b=igIyL3IN+njId1lJcF8Q/h6A1txcyYSnlkwtZOnik9m9zqlhdpZGG6YwFq8d/xglEzPVnzA+6DwZZsR4w6UdojFZJFZWREQ2bFv1wQnmIvSNErquuF3eibwz4705ikoa8Bew/uwAcq6xkwQ8xPh8VI7cMKR/mqVzLvYoWfeJ5i4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749824; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=p8G3xJseCAQsG9zZXIZIjTef0f7tIpl3BFcTXms9Rp0=; b=dkmibGbO9GE68LLouCCcEL5yAh1T2QFsndAcwRBakbPCJivhVdp15QhxKJiB+U5srC2NRH4aMopkwcEFR4qUJSXeGd3GkZRvgj2VRPD5IFqJ/FXZxcmk4ft550k4rpH4j31mWzNC75Ls0/jsEpDSeyp+i/6AfWlk0DnQJso0XNw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47407+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749824278561.7889068212918; Tue, 17 Sep 2019 12:50:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZiQVYY1788612x6vxSTs8qws; Tue, 17 Sep 2019 12:50:23 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:23 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CC8A30832EA; Tue, 17 Sep 2019 19:50:23 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01ADD600C4; Tue, 17 Sep 2019 19:50:21 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH 20/35] NetworkPkg/Ip4Dxe: fix NetLibDestroyServiceChild() call Date: Tue, 17 Sep 2019 21:49:20 +0200 Message-Id: <20190917194935.24322-21-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 17 Sep 2019 19:50:23 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: Os6ZjEqgx5dvgE9OalyGWgkyx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749823; bh=jRW8dbPxGkfDb2vqcQepFZj8awfCTCbAXGdbIUZ3+uI=; h=Cc:Date:From:Reply-To:Subject:To; b=sZgSgr9KGY+Zj67J1cAmYb4Lofz13fnT4hMBSsQVcCzgY1nqmZj0XXzUdiX6rc2reXu 2AQ5U+E/rH6FJGs6ozspwSAyGK9LqXEPpflfbpKVzRre2AZmeN56oCcvn3VPd4aGl8Fa5 eIWQRhpEBm78EqjuKFnvHS3OMRLfuBH7evY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Both NetLibDestroyServiceChild() and EFI_SERVICE_BINDING_DESTROY_CHILD take an EFI_HANDLE for the "ChildHandle" parameter, not an (EFI_HANDLE*). This patch fixes a real bug. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Siyuan Fu --- Notes: possibly only build-tested NetworkPkg/Ip4Dxe/Ip4If.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/Ip4Dxe/Ip4If.c b/NetworkPkg/Ip4Dxe/Ip4If.c index 44b8d9fc8faf..53a333037f94 100644 --- a/NetworkPkg/Ip4Dxe/Ip4If.c +++ b/NetworkPkg/Ip4Dxe/Ip4If.c @@ -592,7 +592,7 @@ Ip4SetAddress ( Interface->Controller, Interface->Image, &gEfiArpServiceBindingProtocolGuid, - &Interface->ArpHandle + Interface->ArpHandle ); =20 Interface->ArpHandle =3D NULL; @@ -657,7 +657,7 @@ ON_ERROR: Interface->Controller, Interface->Image, &gEfiArpServiceBindingProtocolGuid, - &Interface->ArpHandle + Interface->ArpHandle ); =20 return Status; --=20 2.19.1.3.g30247aa5d201 -=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 (#47407): https://edk2.groups.io/g/devel/message/47407 Mute This Topic: https://groups.io/mt/34180221/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47408+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47408+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749826; cv=none; d=zoho.com; s=zohoarc; b=k58nIOI+fle6jSOxQyOGqSjmISwSqHpHhSXXk5xfr/cx01pL7N8D3JGEK+3whr4wPYBS4g5nB5qhqftZx/33vueG9xhBgoA4iCXk6eNjGciPbzzminyPgtcWQj88CPYDBg6LjOVwEgEyjBlwbDLbVn2DIL43wIqEasHSaOzxSSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749826; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Dvx+q/+NCHrBQ4UU/uG9ruqwrBxCbQzd5UFho/+E7Ks=; b=jsGt2Mxz25G+CjxibVJHdn5mbH4q3u4Wg3gDM2IlIuSwXZR18xtNRRN1pxd4EZhu7g9ti+yA7tXjD73AvhrCIFhEGrZOQ7CQj9Pkn6J0z3b+K7f5rVI8fLN6GZcz3XrMtJ56+pUw6qEpWkj0fjPN3Wc63vnWy8R0cSL8RMjY01A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47408+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749826044400.122118831988; Tue, 17 Sep 2019 12:50:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cfrYYY1788612xKuE9Q2lO3c; Tue, 17 Sep 2019 12:50:25 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:24 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7381810DCC81; Tue, 17 Sep 2019 19:50:24 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69450600C4; Tue, 17 Sep 2019 19:50:23 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH 21/35] NetworkPkg/TcpDxe: fix SockFreeFoo() parameter list Date: Tue, 17 Sep 2019 21:49:21 +0200 Message-Id: <20190917194935.24322-22-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Tue, 17 Sep 2019 19:50:24 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 3S4C86KAJYlQ34ydHxtJe4MWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749825; bh=8Oa5jSDEBgNQ6J1kubje3xqHXzqx2wMEo/O6tW1VRBU=; h=Cc:Date:From:Reply-To:Subject:To; b=wJmHUG5NlaOx+sZWY6Omy9Rs88Vd+mfGKYSyX0jTMdUBNdqj2voUc7pzWnJzoe+N56W qbJKz+ViNUHWlzdMKlur1NCk4BBihW08bGMqAJqglYNwFryowv8lxoK9DdoKJHfvj6Y7w 5xxfvMi6yz19CdTM8G6kpgpjnlj340ycKRE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The SockFreeFoo() callback function for NetbufFromExt() has to match the NET_VECTOR_EXT_FREE prototype, which takes a (VOID*) as callback argument (Arg). EFI_EVENT has nothing to do with NET_VECTOR_EXT_FREE. Fix the SockFreeFoo() parameter list. This change is a no-op in practice. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Siyuan Fu --- Notes: build-tested only NetworkPkg/TcpDxe/SockImpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/TcpDxe/SockImpl.c b/NetworkPkg/TcpDxe/SockImpl.c index f5e01771e2a8..fb28e2ed40d3 100644 --- a/NetworkPkg/TcpDxe/SockImpl.c +++ b/NetworkPkg/TcpDxe/SockImpl.c @@ -67,13 +67,13 @@ SockBufNext ( /** User provided callback function for NetbufFromExt. =20 - @param[in] Event The Event this notify function registered to, ignore= d. + @param[in] Arg The Arg parameter forwarded by NetbufFromExt(). Igno= red. =20 **/ VOID EFIAPI SockFreeFoo ( - IN EFI_EVENT Event + IN VOID *Arg ) { return; --=20 2.19.1.3.g30247aa5d201 -=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 (#47408): https://edk2.groups.io/g/devel/message/47408 Mute This Topic: https://groups.io/mt/34180222/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47409+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47409+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749827; cv=none; d=zoho.com; s=zohoarc; b=hLBuSSMuKRlpNa3wnK8WMh++g0fg2QLN8J1ih4g4WeF0g4cmXYhFPAiwUtGKPkRsz9fxMLbTaU9mQypnKqAczsvFiOHxlzHphqtNH0AZFahcr5NSwVX1mQ8Se4Zfqxbm78rH5xgwxQoFk1knZdnGMTfxHHRgDZItawTYwWviI80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749827; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hcw2caXgULDWeCcQNVJLALJhbu/pHik3lxvGvbeeA7w=; b=JnY54GF5DAByqEisFMKjBxuYPcaJMcdksnhDIZyEN5joxxaq+q9qfauXqlIlOBzh1n6tAYZZ6LHLU4KXZp/jKI+y/DffKmT2CNMjz8+h/k51idBVLLzNh1Bc5gLP5KScbbIOqBs6LKVtEK/U97s0CTPA02+GEoos4DTSbzVFlwo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47409+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749827644610.5472969601691; Tue, 17 Sep 2019 12:50:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AurAYY1788612xvyHQ8MLRBw; Tue, 17 Sep 2019 12:50:27 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:26 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D6BD1918641; Tue, 17 Sep 2019 19:50:26 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1729600C4; Tue, 17 Sep 2019 19:50:24 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall Subject: [edk2-devel] [PATCH 22/35] OvmfPkg/XenBusDxe: fix UninstallMultipleProtocolInterfaces() call Date: Tue, 17 Sep 2019 21:49:22 +0200 Message-Id: <20190917194935.24322-23-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 17 Sep 2019 19:50:26 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: E9hiV5rg9iBl74RxGirmaTnpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749827; bh=fPiNfHH6ma4io6K/+YOVxmgQ3Pwkdy8ISa9bD2yxCD4=; h=Cc:Date:From:Reply-To:Subject:To; b=uSZKxzdr095xzaavAJHC5ofe2yzo71OKNl5CsEPznhAWzSiQxSUMM0bFM1cX+NqgrtD nldadkto8kC8XeT8EDk8GQ0r3L8K6rVJNq8DaaXi2aZlMgGuE+GjD84LuT0jYsqYiBVRM fUmOdZEAjJe3c+WSMcDLcAcidoZ5wIvf33k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Unlike the InstallMultipleProtocolInterfaces() boot service, which takes an (EFI_HANDLE*) as first parameter, the UninstallMultipleProtocolInterfaces() boot service takes an EFI_HANDLE as first parameter. This is an actual bug. It must have remained hidden until now because it's on an error path. Fix the UninstallMultipleProtocolInterfaces() call. Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Signed-off-by: Laszlo Ersek Reviewed-by: Anthony PERARD Reviewed-by: Hao A Wu Reviewed-by: Julien Grall Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only OvmfPkg/XenBusDxe/XenBus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c index bb8ddbc4d44d..2451e58a5961 100644 --- a/OvmfPkg/XenBusDxe/XenBus.c +++ b/OvmfPkg/XenBusDxe/XenBus.c @@ -210,7 +210,7 @@ XenBusAddDevice ( =20 ErrorOpenProtocolByChild: gBS->UninstallMultipleProtocolInterfaces ( - &Private->Handle, + Private->Handle, &gEfiDevicePathProtocolGuid, Private->DevicePath, &gXenBusProtocolGuid, &Private->XenBusIo, NULL); --=20 2.19.1.3.g30247aa5d201 -=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 (#47409): https://edk2.groups.io/g/devel/message/47409 Mute This Topic: https://groups.io/mt/34180223/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47410+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47410+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749829; cv=none; d=zoho.com; s=zohoarc; b=I9+kbmBJEMb/Kbry3BEhLr6WzVdQWKZvCX3NxBvEa3jn44QTYeR7ZPkmhUOcnwFelcteSrmoOaxUvKnt5XP3FeG4/QC58OBLRxVaOmmfWK5Vtjv+qUp6FQ4D4FeemMXO4uJDE93sGbdn5YTng+G8BGJfuLNIb35f0rhvlg+SCSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749829; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=D6nGGuiguG8zeTkouG6baFxADH0Jlq7Orm0PG8jYnpc=; b=Lhy0WSaUJbxSQIYoJnqZWvL6znYBkAJ4Z5icecL8wTmLzUO+MiW6jj6NG/m933mku/o3pqRSPHDVZ8kcaFhS9TuABNYxILqIX8HGnq90hnJe7hXGa/DCD9xH9Tkm+844qpANyQ9Ia8xf07k8wyzdtt9JxskibLX9ry3J29Y9Oms= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47410+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749829030699.7652680713093; Tue, 17 Sep 2019 12:50:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8kpnYY1788612xirYS15diE2; Tue, 17 Sep 2019 12:50:28 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:28 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5ED73018ECE; Tue, 17 Sep 2019 19:50:27 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC6A4600C4; Tue, 17 Sep 2019 19:50:26 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen Subject: [edk2-devel] [PATCH 23/35] OvmfPkg/VirtioNetDxe: fix SignalEvent() call Date: Tue, 17 Sep 2019 21:49:23 +0200 Message-Id: <20190917194935.24322-24-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 17 Sep 2019 19:50:27 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: 6ePb9A3nYkKglzZjaveYSlEJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749828; bh=UqVnT8EnoSaJeF/IH8OzwcxzTXCZ80qkjCWmEHVvrtQ=; h=Cc:Date:From:Reply-To:Subject:To; b=w/rBOYKsyiTw1ic9bi6OBXx4K4wgjZN/20/nDWScGySfWPJGJjZv/tKLSCziUoILhpv LUua2YOIUcrKQw33pA9F5dFvikjw20Oh4VjJUEIPxkcUgExcw9HDUPGme9Na9/TyJTAuA F08r9+nTFanGD28hmPt/SzcnjLsOCt7iU2o= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The SignalEvent() boot service takes an EFI_EVENT, not an (EFI_EVENT*). Fix the call in the notification function of "EFI_SIMPLE_NETWORK_PROTOCOL.WaitForPacket". This is an actual bug. The reason it's never been triggered is likely that the "SNP.WaitForPacket" event is rarely waited for by applications -- edk2 itself has zero instances of that, for example. Cc: Ard Biesheuvel Cc: Jordan Justen Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only OvmfPkg/VirtioNetDxe/Events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/VirtioNetDxe/Events.c b/OvmfPkg/VirtioNetDxe/Events.c index 620910774bc5..83e96e5e5d91 100644 --- a/OvmfPkg/VirtioNetDxe/Events.c +++ b/OvmfPkg/VirtioNetDxe/Events.c @@ -58,7 +58,7 @@ VirtioNetIsPacketAvailable ( MemoryFence (); =20 if (Dev->RxLastUsed !=3D RxCurUsed) { - gBS->SignalEvent (&Dev->Snp.WaitForPacket); + gBS->SignalEvent (Dev->Snp.WaitForPacket); } } =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47410): https://edk2.groups.io/g/devel/message/47410 Mute This Topic: https://groups.io/mt/34180224/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47411+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47411+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749830; cv=none; d=zoho.com; s=zohoarc; b=HsBe3R4juAPKf8fhBiQIUL8XkpeKjzPNUfXgfiEBI7e2SWRg+mbtPNKlcbaPynFljDoNrDWDjQiC3IzNQjOZZBryhEqFspKPAWFqbQmJCa7roIoiLDB3rG1fOkX3SpswkuJnoK0pKRNZ2rq6HVPaR3+6Sxohm6jai84WHTOAGH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749830; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=+afYzAbiSg8YQcpzt8OxQ4D2xSG8ScNj2khMZItAYiY=; b=MfE7KIZKWQ5Oxj8zzbMdRnycJrH20qQ5/5u4ZLd48xzm4LsppylZ2RxlfiHNwiLG4jcMPxIA5UBCEoj4ypAx8D4vhE1cD/y+3bPckjeY9eI429JOrZearm6LByGgSiHKRcJTvdhUPzhTAxUhXYnz/GprjoLORCTlnbJNW38XPAY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47411+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749830334321.9105759906796; Tue, 17 Sep 2019 12:50:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tpJjYY1788612xFD2ZJqvl5P; Tue, 17 Sep 2019 12:50:29 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:29 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AAD083F40; Tue, 17 Sep 2019 19:50:29 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20E25600C4; Tue, 17 Sep 2019 19:50:27 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen Subject: [edk2-devel] [PATCH 24/35] OvmfPkg/PlatformDxe: fix EFI_HII_HANDLE parameters of internal functions Date: Tue, 17 Sep 2019 21:49:24 +0200 Message-Id: <20190917194935.24322-25-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 17 Sep 2019 19:50:29 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: iDJ9QVE5M9QPfHb3OKkv3sbqx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749829; bh=3M173DsmfHk4frAhkueD0/jLMIw61QgDQ8RlgKEEgQw=; h=Cc:Date:From:Reply-To:Subject:To; b=TG7zQshei6F3tLS0F1/FH2FWazFsAd2U2gUA9+2+sVxIAE6ll8VR3NbuK5BIzEG/50y 3cOzlgG+UP4Bq7y0ibe4sJPXLculvJoHvtcBDg4r3L/WxXRoHC2hzisOhUcQr6t4UmeSL oF7CGUHQKeKVmB6LVG0rWkekPKj7CO7rCrw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In the following call tree: PlatformInit () mInstalledPackages =3D HiiAddPackages () GopInstalled () PopulateForm (PackageList =3D mInstalledPackages) CreateResolutionOptions (PackageList) HiiSetString (PackageList HiiUpdateForm (PackageList) PlatformDxe passes around an EFI_HII_HANDLE that (a) originates from HiiAddPackages() and (b) is ultimately passed to HiiSetString() and HiiUpdateForm(). The intermediate functions PopulateForm() and CreateResolutionOptions() however take that parameter as an (EFI_HII_HANDLE*). There is no bug in practice (because the affected functions never try to de-reference the "PackageList" parameter, they just pass it on), but the function prototypes are semantically wrong. Fix that. This could remain hidden so long because pointer-to-VOID silently converts to/from any pointer-to-object type, and the UEFI spec mandates that EFI_HII_HANDLE be a typedef to (VOID*). Cc: Ard Biesheuvel Cc: Jordan Justen Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: tested in UiApp OvmfPkg/PlatformDxe/Platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 09181769babf..23ad43901f66 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -486,7 +486,7 @@ STATIC EFI_STATUS EFIAPI CreateResolutionOptions ( - IN EFI_HII_HANDLE *PackageList, + IN EFI_HII_HANDLE PackageList, OUT VOID **OpCodeBuffer, IN UINTN NumGopModes, IN GOP_MODE *GopModes @@ -547,7 +547,7 @@ STATIC EFI_STATUS EFIAPI PopulateForm ( - IN EFI_HII_HANDLE *PackageList, + IN EFI_HII_HANDLE PackageList, IN EFI_GUID *FormSetGuid, IN EFI_FORM_ID FormId, IN UINTN NumGopModes, --=20 2.19.1.3.g30247aa5d201 -=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 (#47411): https://edk2.groups.io/g/devel/message/47411 Mute This Topic: https://groups.io/mt/34180225/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47412+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47412+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749832; cv=none; d=zoho.com; s=zohoarc; b=Xw7SKB//Hsn22IGv6I/1h1eh/UWOK9AmYR62tr20CSUnmutsOWOMt4HHhTij1HaTPujK3vF49h+AaUgYsizI/xA2EvANRVvil+2AdQ4pBY5DeIdWThy3IcGff7n7vB/qgwTHWy4nmDt5Q4JjACwTnVc8BouVWREOFDg+ruo7PhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749832; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=rApVVf59o5W/vWrNRUO5QZJykKQDBlVYXNQRbh8Xdiw=; b=XtxUQsUFppKwChHkPiR/N4g3P1+Th3VkjDV1XMhTUOBD7FOucGCspFixi7k/QWQ5jhiVr3tiOWSwWR/ujAfNvXFhWlR3OEXCV3sikQQQ2ntCs/iQqn6iHrN3CtFFHn9vToN6syODnldZDWZ3oay5QHH1KyHumrEd31jUyEFco8c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47412+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749832396166.89721724738627; Tue, 17 Sep 2019 12:50:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SEu7YY1788612xOyqa6orM4H; Tue, 17 Sep 2019 12:50:31 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:31 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6C7A8980E0; Tue, 17 Sep 2019 19:50:30 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BE79600C4; Tue, 17 Sep 2019 19:50:29 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , David Woodhouse , Jordan Justen Subject: [edk2-devel] [PATCH 25/35] OvmfPkg/VideoDxe: document EFI_EDID_OVERRIDE_PROTOCOL.GetEdid() call Date: Tue, 17 Sep 2019 21:49:25 +0200 Message-Id: <20190917194935.24322-26-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 17 Sep 2019 19:50:30 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: hFwPfXQ5eHPxbSLAs2aOgNYpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749831; bh=YFOOtzymYqcBFBl/c3XiE8d2iIbvc2sP+JHr4Mg0W2M=; h=Cc:Date:From:Reply-To:Subject:To; b=svdEYww6qETLryjgyXKWgEGEeOVn7MMiFJiYnBpO1zh6Y3kNnGDT0EKq40hm53Ty0e9 w72M2dYjxOSIcal9pMa1zPdiug8acnjViW0qgheXGlu3OJ6K48lsppU7X54kYM2A7nvX6 F0JRmnasss63YBSONNKnPEoExuyJGXEqRpo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" According to the UEFI spec -- and to the edk2 header "MdePkg/Include/Protocol/EdidOverride.h" too --, EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID takes an (EFI_HANDLE*), and not an EFI_HANDLE, as second parameter ("ChildHandle"). This is probably [*] a bug in the UEFI spec. Given that this CSM module (VideoDxe) had been used for a long time on physical platforms before it was moved to OvmfPkg, keep the current "ChildHandle" argument, just cast it explicitly. [*] The edk2 tree contains no other GetEdid() call, and also no GetEdid() implementation. The edk2-platforms tree contains two GetEdid() calls, at commit 022c212167e0, in files - "Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkGop/Edid.c", - "Drivers/OptionRomPkg/CirrusLogic5430Dxe/Edid.c". From these, the first passes an (EFI_HANDLE*) as "ChildHandle", the second passes an EFI_HANDLE. It's difficult to draw a conclusion. :/ No functional changes. (I've also requested a non-normative (informative) clarification for the UEFI spec: , in the direction that matches this patch.) Cc: Ard Biesheuvel Cc: David Woodhouse Cc: Jordan Justen Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu --- Notes: build-tested only OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosT= hunk/VideoDxe/BiosVideo.c index 0640656dba14..995136adee27 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -1402,9 +1402,13 @@ BiosVideoCheckForVbe ( goto Done; } =20 + // + // Cast "ChildHandle" to (EFI_HANDLE*) in order to work around the spe= c bug + // in UEFI v2.8, reported as Mantis#2018. + // Status =3D EdidOverride->GetEdid ( EdidOverride, - BiosVideoPrivate->Handle, + (EFI_HANDLE *) BiosVideoPrivate->Handle, &EdidAttributes, &EdidOverrideDataSize, (UINT8 **) &EdidOverrideDataBlock --=20 2.19.1.3.g30247aa5d201 -=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 (#47412): https://edk2.groups.io/g/devel/message/47412 Mute This Topic: https://groups.io/mt/34180226/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47413+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47413+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749833; cv=none; d=zoho.com; s=zohoarc; b=m5H+J8KgQeEsYwks0qvQbBOis5GQw1jWhJP9+ygwv7wp7xviigw8iSLLYtm8Vuu/96A/W64MMGCRnIbCwzPB6Z1y8S0WM5nRX2+3R5zckSSwefn8yCKAcNTTapXNE4i9IXkwVaYDsbmmjhxXoXL8U5/fxFwsY3Tle+lo94UCows= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749833; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=fOFCK8Txt48oPaPQEnDq37AJgHyrd1bS96nQDxf+ZHg=; b=K/nT81VFkXd8W92PJu6GWYBhhAnTL3Ge4IbCoq77QPHSq/vAtxSH3MbSYlLzEhwrOdwlqvv1nGQVzCuCyDyatXIazrYcAlz/YHytuG2iVCzgay5jHk+L7EQ6psmhBFWKr8w5/fMYnlaamAeiI1WeeBIv6LXUhvkr3feC/8ovyJE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47413+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749833547245.32153922993155; Tue, 17 Sep 2019 12:50:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WgjOYY1788612x6cg3iLPqaM; Tue, 17 Sep 2019 12:50:33 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:32 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B97110F2E81; Tue, 17 Sep 2019 19:50:32 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 303D4600C4; Tue, 17 Sep 2019 19:50:30 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Chao Zhang , Jian Wang , Jiewen Yao Subject: [edk2-devel] [PATCH 26/35] SecurityPkg: fix UninstallMultipleProtocolInterfaces() calls Date: Tue, 17 Sep 2019 21:49:26 +0200 Message-Id: <20190917194935.24322-27-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 17 Sep 2019 19:50:32 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: PaHt7j4XfFThoroIdwnumjgRx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749833; bh=QsoNwb2jErGVG9FarpWau0s+dBFmCefdp6Ms6iEavDU=; h=Cc:Date:From:Reply-To:Subject:To; b=m1RpGFbR9AfVpJ3fS/OY0DgsJm2XdbCHyB9VzKbD4rcTDjd/kUR9f1DfL+NnuOxafJP 6xrSup/eILTAwT08yA3avqoaKijfNBxP/jSuwKq967k2IE4eq30T0VpeCVyuHNGtx4Ls1 yrOoYtMoGSy6kC5JMBveIDgB2fgwVHPPYhw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Unlike the InstallMultipleProtocolInterfaces() boot service, which takes an (EFI_HANDLE*) as first parameter, the UninstallMultipleProtocolInterfaces() boot service takes an EFI_HANDLE as first parameter. These are actual bugs. They must have remained hidden until now because they are all in Unload() functions, which are probably exercised infrequently. Fix the UninstallMultipleProtocolInterfaces() calls. Cc: Chao Zhang Cc: Jian Wang Cc: Jiewen Yao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Jiewen Yao Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c = | 2 +- SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c = | 2 +- SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriv= er.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c b/SecurityPkg/Tc= g/Tcg2Config/Tcg2ConfigDriver.c index 54155a338100..9052eced757d 100644 --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c @@ -443,7 +443,7 @@ Tcg2ConfigDriverUnload ( ASSERT (PrivateData->Signature =3D=3D TCG2_CONFIG_PRIVATE_DATA_SIGNATURE= ); =20 gBS->UninstallMultipleProtocolInterfaces ( - &ImageHandle, + ImageHandle, &gEfiCallerIdGuid, PrivateData, NULL diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c b/SecurityPkg/T= cg/TcgConfigDxe/TcgConfigDriver.c index 341879e4c4ba..fb06624fdb8f 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c @@ -138,7 +138,7 @@ TcgConfigDriverUnload ( ASSERT (PrivateData->Signature =3D=3D TCG_CONFIG_PRIVATE_DATA_SIGNATURE); =20 gBS->UninstallMultipleProtocolInterfaces ( - &ImageHandle, + ImageHandle, &gEfiCallerIdGuid, PrivateData, NULL diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigDriver.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Se= cureBootConfigDriver.c index 798ef9cfbc01..6c0294151e6c 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gDriver.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gDriver.c @@ -115,7 +115,7 @@ SecureBootConfigDriverUnload ( ASSERT (PrivateData->Signature =3D=3D SECUREBOOT_CONFIG_PRIVATE_DATA_SIG= NATURE); =20 gBS->UninstallMultipleProtocolInterfaces ( - &ImageHandle, + ImageHandle, &gEfiCallerIdGuid, PrivateData, NULL --=20 2.19.1.3.g30247aa5d201 -=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 (#47413): https://edk2.groups.io/g/devel/message/47413 Mute This Topic: https://groups.io/mt/34180228/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47414+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47414+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749835; cv=none; d=zoho.com; s=zohoarc; b=EhDh+zsS9uoIZVnFHIoLA9acZ8KxHcj3HMa11eR9FAccNUaYElnkdXHVY4ZpNOOgFtkeT8NOuaHbo3PYabMaJNjJLKPLUJsIgSdg297vwWbkPQSkkAvib0QUqFLFhTN7fewJuKFfwq6JYzuehifji07FUU7gVY3WJENEmPKPuM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749835; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=+lUOoRJnMkUHas+/S0O2Vg3LhcM718HP2cgnCxg8m2Q=; b=AIVXTn3PszmsGoOjgNRIOoT3vPCqrO4Kwl7eBdpT0p58mf8T8LagPCHHJijfWEWQikH81s6Yy5TrpNSiOsBkD5LFvL4SzYft1ZstefahbRwaJcTrpQ1G+Sx2/pshBeI/v7hyuUvQeiRBdJ6P+jTqlMJaNn99O9C1kEzMR7zzcKY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47414+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15687498359146.502570952970132; Tue, 17 Sep 2019 12:50:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0uYsYY1788612xx5G6yVK1Hg; Tue, 17 Sep 2019 12:50:34 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:34 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1275337E79; Tue, 17 Sep 2019 19:50:34 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAA8A600C8; Tue, 17 Sep 2019 19:50:32 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Chao Zhang , Jian Wang , Jiewen Yao Subject: [edk2-devel] [PATCH 27/35] SecurityPkg: stop abusing EFI_EVENT for protocol notify registration Date: Tue, 17 Sep 2019 21:49:27 +0200 Message-Id: <20190917194935.24322-28-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 17 Sep 2019 19:50:34 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: Txx9Upc0FVEb0InF6hVTSNR4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749834; bh=KaurmW7ZdSuM1MaFQ6hjorSdVRNgZL2w/q0DxfK22zA=; h=Cc:Date:From:Reply-To:Subject:To; b=MG6+ZQKvHmZsLD3cZbE93QtGhyru6yuP25KTdXKGzn+AHVtTG8fh6VSdzIX5tBglp8H wLIwSlWUARLkKZ5hXho4Rs3plHzen38NnR5xEmSqsWpEPQt1ceBKOiEma/nP1diGMPfBj zzhk2PKrUQ7EJu8QXq+FN9iEkv3OsHZQeVM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" EfiCreateProtocolNotifyEvent() takes a (VOID**) for "Registration", similarly to gBS->RegisterProtocolNotify(). We should pass the address of an actual pointer-to-VOID, and not the address of an EFI_EVENT. EFI_EVENT just happens to be specified as (VOID*), and has nothing to do with the registration. This change is a no-op in practice; it's a semantic improvement. Cc: Chao Zhang Cc: Jian Wang Cc: Jiewen Yao Signed-off-by: Laszlo Ersek Reviewed-by : Chao Zhang Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only SecurityPkg/HddPassword/HddPasswordDxe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c b/SecurityPkg/HddPass= word/HddPasswordDxe.c index b0d795b6597f..051e64091d7f 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.c +++ b/SecurityPkg/HddPassword/HddPasswordDxe.c @@ -2770,7 +2770,7 @@ HddPasswordDxeInit ( { EFI_STATUS Status; HDD_PASSWORD_DXE_PRIVATE_DATA *Private; - EFI_EVENT Registration; + VOID *Registration; EFI_EVENT EndOfDxeEvent; EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock; =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47414): https://edk2.groups.io/g/devel/message/47414 Mute This Topic: https://groups.io/mt/34180229/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47415+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47415+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749836; cv=none; d=zoho.com; s=zohoarc; b=VqbaSv5PLrOLSIN/HvSTu6h2bXPO2HJs30zKqCWdsJhavrQ7wQsBNYyJ8hhAQXPLtEtxpF3RIrqNx+LvMGvVS3Eu31eiU+OFKLFPbfw4WBrl6fCxD3LONACB4XbBBb904OPLbqWVsZHTbBAOmWZq3FME9hU96f6r7vQPbrp09Rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=fYVFl+55WCkgf7nPLpweRgg9BuZ2lT+SkJa+H85h0H0=; b=jrFd9rZH8671cNv9//A4cD0kKu4KNmHFDOMG733XKWocWl7jZ2tGRNtL+4JASvXZgfc6bJfgXCZfnQak+gppvOAfp8xf1fIS++v0oUQukg9GQPY0CqLTfylBei5Z0kStHuLRCcHJ5cHwnpQfRGMDnF99VO0QzYgSWsnGtutWoJM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47415+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749836917947.5559574385212; Tue, 17 Sep 2019 12:50:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HvDdYY1788612xm73bgpWD09; Tue, 17 Sep 2019 12:50:36 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:36 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABEF58980E0; Tue, 17 Sep 2019 19:50:35 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70A336012C; Tue, 17 Sep 2019 19:50:34 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 28/35] ShellPkg/UefiShellDriver1CommandsLib: fix parameter list typo Date: Tue, 17 Sep 2019 21:49:28 +0200 Message-Id: <20190917194935.24322-29-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 17 Sep 2019 19:50:35 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: CIldXLVy6KXeIpMHER11lLxkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749836; bh=EGY0qrAcdmmRBg1RO0Es1M1TlMT/1Pl/keekS9mBqZQ=; h=Cc:Date:From:Reply-To:Subject:To; b=X/MuwD9zODZxdmEaaxmCCLb7rK+THineojCwQSNjxTrTKbxPrzKBnofh3hwTf1eJBNJ 9Aqo1h4rZb9uoeTtH18WGhN3IrImQ1Ki1eHZbQ8i6AJJT/7RnPW+RkunlA18uSVTEEnG7 pJB8upvzHgkZBohrfWco/hSnAPrMbPos0Qk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The ShellCommandRunConnect() function passes EFI_HANDLE -- (VOID*) -- objects to ConvertAndConnectControllers(), and ConvertAndConnectControllers() passes those to gBS->OpenProtocol(). Accordingly, ConvertAndConnectControllers() should specify EFI_HANDLE parameter types, not (EFI_HANDLE*) -- (VOID**) -- types. This typo is masked because (VOID*) converts to and from any pointer-to-object type silently. Note that functionally speaking there is no problem, so this patch does not change beavior, only cleans up the code. Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Zhichao Gao --- Notes: tested with "connect -r" ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/Shell= Pkg/Library/UefiShellDriver1CommandsLib/Connect.c index 359394dfd291..3f4e132674ea 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c @@ -346,8 +346,8 @@ ShellConnectFromDevPaths ( **/ EFI_STATUS ConvertAndConnectControllers ( - IN EFI_HANDLE *Handle1 OPTIONAL, - IN EFI_HANDLE *Handle2 OPTIONAL, + IN EFI_HANDLE Handle1 OPTIONAL, + IN EFI_HANDLE Handle2 OPTIONAL, IN CONST BOOLEAN Recursive, IN CONST BOOLEAN Output ) --=20 2.19.1.3.g30247aa5d201 -=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 (#47415): https://edk2.groups.io/g/devel/message/47415 Mute This Topic: https://groups.io/mt/34180231/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47416+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47416+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749839; cv=none; d=zoho.com; s=zohoarc; b=ipldDxTlNIac53xl3IgVMOKuOxz4OT9k7l1hhRgA8OEViJjxl3W26EuOYXE85EEKkeKBjka/AdTqGZ8IAk2t2zW0Oq3D+zrrcVn4wcp7MlrDNVLkxpYiPmV7FyGZbBZKXQ+0qh2so0RHdbyymJ1ulURxVeA/RVcgdG+Uat7riBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2fwKYYxEdKmsLmi+ZB4BOOvExZ+Cf4dci2YLdV4SArI=; b=RtXebnzxP/QDN1YKVmtZ5t1uYGj51RFqJtJvgKunEvDVtfzqLdQMW8bf41DYiwqmJhdvm2nXhYpna+dtVaXtqFynIvWaJavefMCTs9EISqw9LdwR4BQ2HOXjnCRqckZkMhfxcJ53OBHr96FjvM2gd19iCYoakfYDMrheva2CAU0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47416+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749839885796.5639597073128; Tue, 17 Sep 2019 12:50:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id mPwBYY1788612xPBNKGhgUTq; Tue, 17 Sep 2019 12:50:38 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:37 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86280308424C; Tue, 17 Sep 2019 19:50:37 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17E33600C4; Tue, 17 Sep 2019 19:50:35 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 29/35] ShellPkg: stop using EFI_HANDLE in place of EFI_HII_HANDLE Date: Tue, 17 Sep 2019 21:49:29 +0200 Message-Id: <20190917194935.24322-30-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 17 Sep 2019 19:50:37 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: JgAJDKKnDBURb0UYA2qzcA2Ix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749838; bh=ivyiJCEvFVS58DCZwxl3W5HJZ4eBwnLv8xx+8sjV5iY=; h=Cc:Date:From:Reply-To:Subject:To; b=Tq5de0QJqaWXLlB5lStXGWzKC7iN+QtleX9bFEldufT3w7RFqXhC8DnGuF5bo4P8xB/ ApRD0KHFfZR7YuZUnuSaFVBA1pkRA4lp27ybd6pHmEilxeKBURLw9IyLSqWMwOT8cXFdm s8c1criKybaOh8xWg6w8N4GFByY02H7E9hc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The UefiShell*CommandsLib instances have constructor functions that do something like: gHiiHandle =3D HiiAddPackages (...); ... ShellCommandRegisterCommandName (..., gHiiHandle, ...); and destructor functions that implement the following pattern: HiiRemovePackages (gHiiHandle); The -- semantic, not functional -- problem is that "gHiiHandle" is declared with type EFI_HANDLE, and not EFI_HII_HANDLE, in all of these library instances, even though HiiAddPackages() correctly returns EFI_HII_HANDLE, and HiiRemovePackages() takes EFI_HII_HANDLE. Once we fix the type of "gHiiHandle", it causes sort of a butterfly effect, because it is passed around widely. Track down and update all of those locations. The DynamicCommand lib instances use a similar pattern, so they are affected too. NOTE: in practice, this patch is a no-op, as both EFI_HII_HANDLE and EFI_HANDLE are typedefs to (VOID*). However, we shouldn't use EFI_HANDLE where semantically EFI_HII_HANDLE is passed around. Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Zhichao Gao --- Notes: tested with: - level 1: stall, exit - level 2: ls - level 3: pause - dynamic command: tftp - handle parsing: drivers, devices, dh ShellPkg/Include/Library/ShellCommandLib.h = | 2 +- ShellPkg/Include/Library/ShellLib.h = | 4 ++-- ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h = | 4 ++-- ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h = | 4 ++-- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h = | 2 +- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h= | 2 +- ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib= .h | 2 +- ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib= .h | 2 +- ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c = | 6 +++--- ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c = | 6 +++--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c = | 2 +- ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c = | 2 +- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c = | 2 +- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c= | 2 +- ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLib/UefiShellLib.c = | 4 ++-- ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib= .c | 2 +- ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib= .c | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/= Library/ShellCommandLib.h index 287bc0eba7f9..63fcac82a2de 100644 --- a/ShellPkg/Include/Library/ShellCommandLib.h +++ b/ShellPkg/Include/Library/ShellCommandLib.h @@ -136,7 +136,7 @@ ShellCommandRegisterCommandName ( IN UINT32 ShellMinSupportLevel, IN CONST CHAR16 *ProfileName, IN CONST BOOLEAN CanAffectLE, - IN CONST EFI_HANDLE HiiHandle, + IN CONST EFI_HII_HANDLE HiiHandle, IN CONST EFI_STRING_ID ManFormatHelp ); =20 diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library= /ShellLib.h index 31594796cd21..1dc41f2cc11b 100644 --- a/ShellPkg/Include/Library/ShellLib.h +++ b/ShellPkg/Include/Library/ShellLib.h @@ -965,7 +965,7 @@ ShellPrintHiiEx( IN INT32 Row OPTIONAL, IN CONST CHAR8 *Language OPTIONAL, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, ... ); =20 @@ -1260,7 +1260,7 @@ EFIAPI ShellPromptForResponseHii ( IN SHELL_PROMPT_REQUEST_TYPE Type, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, IN OUT VOID **Response ); =20 diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h b/ShellPkg/Dynam= icCommand/DpDynamicCommand/Dp.h index 43aa4505ee37..e446cccde923 100644 --- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h +++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h @@ -36,7 +36,7 @@ #include #include =20 -extern EFI_HANDLE mDpHiiHandle; +extern EFI_HII_HANDLE mDpHiiHandle; =20 #define DP_MAJOR_VERSION 2 #define DP_MINOR_VERSION 5 @@ -133,7 +133,7 @@ RunDp ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ); diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h b/ShellPkg/D= ynamicCommand/TftpDynamicCommand/Tftp.h index 7a9ed4724e1f..4cd778436813 100644 --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h @@ -30,7 +30,7 @@ #include #include =20 -extern EFI_HANDLE mTftpHiiHandle; +extern EFI_HII_HANDLE mTftpHiiHandle; =20 typedef struct { UINTN FileSize; @@ -62,7 +62,7 @@ RunTftp ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ); diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h b/S= hellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h index 36fe628a8c68..8ecc2f6bf5a2 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h @@ -46,7 +46,7 @@ typedef struct{ SHELL_GET_MAN_FILENAME GetManFileName; SHELL_RUN_COMMAND CommandHandler; BOOLEAN LastError; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; EFI_STRING_ID ManFormatHelp; } SHELL_COMMAND_INTERNAL_LIST_ENTRY; =20 diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.h index 32a933b9f062..082d488cb283 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.h @@ -52,7 +52,7 @@ #include =20 =20 -extern EFI_HANDLE gShellDebug1HiiHandle; +extern EFI_HII_HANDLE gShellDebug1HiiHandle; =20 /** Function returns a system configuration table that is stored in the diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1C= ommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver= 1CommandsLib.h index 7e0b8b094057..ee795c4ce024 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.h +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.h @@ -58,7 +58,7 @@ #include =20 =20 -extern EFI_HANDLE gShellDriver1HiiHandle; +extern EFI_HII_HANDLE gShellDriver1HiiHandle; extern BOOLEAN gInReconnect; =20 /** diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.h index 55acdd2b1f95..f2f9cc5dcf3b 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.h @@ -33,7 +33,7 @@ #include #include =20 -extern EFI_HANDLE gShellLevel1HiiHandle; +extern EFI_HII_HANDLE gShellLevel1HiiHandle; =20 /** Function for 'stall' command. diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.h index 6d522d4bb4a1..77be6f1a12c7 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.h @@ -43,7 +43,7 @@ #include =20 extern CONST CHAR16 mFileName[]; -extern EFI_HANDLE gShellLevel2HiiHandle; +extern EFI_HII_HANDLE gShellLevel2HiiHandle; =20 /** Function for 'attrib' command. diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.h index 2d97ae4d3c91..c095b9275ed0 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.h @@ -32,7 +32,7 @@ #include #include =20 -extern EFI_HANDLE gShellLevel3HiiHandle; +extern EFI_HII_HANDLE gShellLevel3HiiHandle; =20 /** Function for 'type' command. diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork= 1CommandsLib.h b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNet= work1CommandsLib.h index d4ed8c04652d..fddada2efa48 100644 --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.h +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.h @@ -38,7 +38,7 @@ #include #include =20 -extern EFI_HANDLE gShellNetwork1HiiHandle; +extern EFI_HII_HANDLE gShellNetwork1HiiHandle; =20 /** Function for 'ping' command. diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork= 2CommandsLib.h b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNet= work2CommandsLib.h index 9a5db32f2b76..9ea42cf26d53 100644 --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.h +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.h @@ -27,7 +27,7 @@ #include #include =20 -extern EFI_HANDLE gShellNetwork2HiiHandle; +extern EFI_HII_HANDLE gShellNetwork2HiiHandle; =20 /** Function for 'ping6' command. diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c b/ShellPkg/Dynam= icCommand/DpDynamicCommand/Dp.c index 735cdcbcc018..4ec4c18348bd 100644 --- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c +++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c @@ -36,7 +36,7 @@ typedef struct { =20 #pragma pack() =20 -EFI_HANDLE mDpHiiHandle; +EFI_HII_HANDLE mDpHiiHandle; =20 typedef struct { EFI_HANDLE Handle; @@ -924,14 +924,14 @@ Done: =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ) { EFI_STATUS Status; EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; =20 // // Retrieve HII package list from ImageHandle diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c b/ShellPkg/D= ynamicCommand/TftpDynamicCommand/Tftp.c index 607899032e9d..f28da9af723c 100644 --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c @@ -11,7 +11,7 @@ #include "Tftp.h" =20 #define IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH 32 -EFI_HANDLE mTftpHiiHandle; +EFI_HII_HANDLE mTftpHiiHandle; =20 /* Constant strings and definitions related to the message indicating the = amount of @@ -1087,14 +1087,14 @@ CheckPacket ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ) { EFI_STATUS Status; EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; =20 // // Retrieve HII package list from ImageHandle diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index f179c4109223..f62d30ef677a 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -14,7 +14,7 @@ #include #include =20 -EFI_HANDLE mHandleParsingHiiHandle =3D NULL; +EFI_HII_HANDLE mHandleParsingHiiHandle =3D NULL; HANDLE_INDEX_LIST mHandleList =3D {{{NULL,NULL},0,0},0}; GUID_INFO_BLOCK *mGuidList; UINTN mGuidListCount; diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandL= ib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c index e8b48b4990dd..f8bcaebe46c8 100644 --- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c +++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c @@ -38,7 +38,7 @@ #include =20 STATIC CONST CHAR16 mFileName[] =3D L"ShellCommands"; -STATIC EFI_HANDLE gShellBcfgHiiHandle =3D NULL; +STATIC EFI_HII_HANDLE gShellBcfgHiiHandle =3D NULL; =20 typedef enum { BcfgTargetBootOrder =3D 0, diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/S= hellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c index 826ced30a8c8..4c48b65fbc1d 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c @@ -554,7 +554,7 @@ ShellCommandRegisterCommandName ( IN UINT32 ShellMinSupportLevel, IN CONST CHAR16 *ProfileName, IN CONST BOOLEAN CanAffectLE, - IN CONST EFI_HANDLE HiiHandle, + IN CONST EFI_HII_HANDLE HiiHandle, IN CONST EFI_STRING_ID ManFormatHelp ) { diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.c index ddce3bef5a30..f918867f47af 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.c @@ -10,7 +10,7 @@ #include =20 STATIC CONST CHAR16 mFileName[] =3D L"Debug1Commands"; -EFI_HANDLE gShellDebug1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellDebug1HiiHandle =3D NULL; =20 /** Gets the debug file name. This will be used if HII is not working. diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1C= ommandsLib.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver= 1CommandsLib.c index 4a05fa9942c4..e2219c62ec25 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.c @@ -9,7 +9,7 @@ #include "UefiShellDriver1CommandsLib.h" =20 STATIC CONST CHAR16 mFileName[] =3D L"Driver1Commands"; -EFI_HANDLE gShellDriver1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellDriver1HiiHandle =3D NULL; BOOLEAN gInReconnect =3D FALSE; =20 /** diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.c index ecbee99e3b3d..88cddd88ddc4 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.c @@ -10,7 +10,7 @@ #include "UefiShellLevel1CommandsLib.h" =20 STATIC CONST CHAR16 mFileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel1HiiHandle =3D NULL; =20 /** Return the help text filename. Only used if no HII information found. diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.c index c2a0bb492fbb..69427637bb87 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.c @@ -29,7 +29,7 @@ #include "UefiShellLevel2CommandsLib.h" =20 CONST CHAR16 mFileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel2HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel2HiiHandle =3D NULL; =20 /** Get the filename to get help text from if not using HII. diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.c index 7d2cc4a48371..ce4afd117aa1 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.c @@ -9,7 +9,7 @@ #include "UefiShellLevel3CommandsLib.h" =20 CONST CHAR16 gShellLevel3FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel3HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel3HiiHandle =3D NULL; =20 /** return the filename to get help from is not using HII. diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Librar= y/UefiShellLib/UefiShellLib.c index 5be530092e1b..835d0f88ca74 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c @@ -2997,7 +2997,7 @@ ShellPrintHiiEx( IN INT32 Row OPTIONAL, IN CONST CHAR8 *Language OPTIONAL, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, ... ) { @@ -3609,7 +3609,7 @@ EFIAPI ShellPromptForResponseHii ( IN SHELL_PROMPT_REQUEST_TYPE Type, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, IN OUT VOID **Response ) { diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork= 1CommandsLib.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNet= work1CommandsLib.c index 7e823cabd2fe..9a2b23fdc5ba 100644 --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.c +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.c @@ -8,7 +8,7 @@ #include "UefiShellNetwork1CommandsLib.h" =20 CONST CHAR16 gShellNetwork1FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellNetwork1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellNetwork1HiiHandle =3D NULL; =20 /** return the file name of the help text file if not using HII. diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork= 2CommandsLib.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNet= work2CommandsLib.c index 5a7ffbfa19eb..4aab4295c1ba 100644 --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.c +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.c @@ -8,7 +8,7 @@ #include "UefiShellNetwork2CommandsLib.h" =20 CONST CHAR16 gShellNetwork2FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellNetwork2HiiHandle =3D NULL; +EFI_HII_HANDLE gShellNetwork2HiiHandle =3D NULL; =20 /** return the file name of the help text file if not using HII. --=20 2.19.1.3.g30247aa5d201 -=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 (#47416): https://edk2.groups.io/g/devel/message/47416 Mute This Topic: https://groups.io/mt/34180232/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47417+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47417+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749841; cv=none; d=zoho.com; s=zohoarc; b=WxWWGyTzWz1LX5SQ9hp8gOF+YdFrPPdpMDDcfMAadCpu1ipN9NdtiGXxOVBKl9sCbewBQ2p6afxWegVmhyvqgO8c8HZLN7cdYuJ53zj4Gi+eK9ZCqztu1xO6Lu4iEZ2o6PZboMEXH1SW6R5s+dAEza6w49oFIXCNKbvccRRm1DI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749841; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=jx3kUOe2vIam1oRIKF74NzqPn7kKohswW9BB3NYr0lo=; b=nqcir4IyiC15Nj3c7sqRiNjarINiTr2vX73HhMPpAHeM4H8/v0avIei1l4psHYBwlFvJhisNtujQsv6pSn/3IBzvQ4PmLI97wb9jfljMvNJ3wzohv/gTMXySkjkl/AnAQ786YQcNPbn2T8D9SD5atvamgb8qg3msR2PgI54nfp0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47417+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749841000725.172326444841; Tue, 17 Sep 2019 12:50:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id huVWYY1788612xQqUTZUD3HX; Tue, 17 Sep 2019 12:50:40 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:39 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 327E483F3C; Tue, 17 Sep 2019 19:50:39 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id E660A600C4; Tue, 17 Sep 2019 19:50:37 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 30/35] ShellPkg: stop taking EFI_HANDLE in place of SHELL_FILE_HANDLE Date: Tue, 17 Sep 2019 21:49:30 +0200 Message-Id: <20190917194935.24322-31-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 17 Sep 2019 19:50:39 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: zLTNhcPqKVvL65LPEBkJm7GDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749840; bh=7hmQuzg2uLUsxWXmDh40P5Ls4UcjSPrbe3RdgyXVtzk=; h=Cc:Date:From:Reply-To:Subject:To; b=cccr8zhl97LMxl1rIR9xlLuFj7rMBEG14KsCgH/Xb1qHbUkVXBZh3RssJmP2ligYqxw /Gm2HrbHoR8xa43oIvPGwKm2vuTV6wHoJwB76UGMsdB7Ihl2dE8611KmoM5kQfXX2LUcs 9igpRPE1Wb6z4iSAL8zBtcxcmnCkvh3802M= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The TouchFileByHandle() and IsDirectoryEmpty() functions are passed SHELL_FILE_HANDLE parameters, and they use those parameters correctly. However, their parameter lists say EFI_HANDLE. Spell out the right type in the parameter lists. In practice, this change is a no-op (because, quite regrettably, both EFI_HANDLE and SHELL_FILE_HANDLE are specified to be typedefs of (VOID*)). Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: tested: rm, touch ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 2 +- ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Li= brary/UefiShellLevel2CommandsLib/Rm.c index 3a1196f1529e..59f7eec376f2 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c @@ -24,7 +24,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] =3D { **/ BOOLEAN IsDirectoryEmpty ( - IN EFI_HANDLE FileHandle + IN SHELL_FILE_HANDLE FileHandle ) { EFI_STATUS Status; diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c b/ShellPkg= /Library/UefiShellLevel3CommandsLib/Touch.c index 0f00344c815e..a215f5774c69 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c @@ -21,7 +21,7 @@ **/ EFI_STATUS TouchFileByHandle ( - IN EFI_HANDLE Handle + IN SHELL_FILE_HANDLE Handle ) { EFI_STATUS Status; --=20 2.19.1.3.g30247aa5d201 -=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 (#47417): https://edk2.groups.io/g/devel/message/47417 Mute This Topic: https://groups.io/mt/34180233/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47418+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47418+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749842; cv=none; d=zoho.com; s=zohoarc; b=L9iRUQQlN7O5bZDKhWxVlucaQeMMhIUWS5lkPE38NDXCOOLK3VRCyIPAMly/8J/xkqr+JrioifdckdkAbGlGJPsPfMj8Mz+YK0z694yEmwQDo6b7J73Ee00Wpd+44/O9i+Zseqh9mmPZazmKf/rkTHAn43wbasmcu7TMdFwrSpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749842; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=1NFudYo2XxlxApwMEST5PMDyouxt6zauhh9pqy4fToA=; b=hHtzZrErQLiaq9JCVqZC14R6W2eXs5VidZ2AEUJXSfQ5CIDKSdc9vlUfXHplzmPjoTD/+7o/EHEVhCwjji7P/xHvxIhnXC6DinaoTL/cQU2o6eqfjYrbWC1W59Np5OUuauFINWFxucwWlaaAk9+Y75toYTIABRz/eXA+mIbalBo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47418+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749842692106.86071705351912; Tue, 17 Sep 2019 12:50:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5lyuYY1788612xrVvusf6Glb; Tue, 17 Sep 2019 12:50:41 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:41 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD2A730860BD; Tue, 17 Sep 2019 19:50:40 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9081B600C4; Tue, 17 Sep 2019 19:50:39 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 31/35] ShellPkg/UefiShellDebug1CommandsLib: fix ShellCloseFile() call Date: Tue, 17 Sep 2019 21:49:31 +0200 Message-Id: <20190917194935.24322-32-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 17 Sep 2019 19:50:40 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: EONwtIDlLD2gwpAW66YkksIZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749841; bh=O2GZGSxLnd8GgmlqSdgv9o/YoS+YWuS9M2RD/X5t1JA=; h=Cc:Date:From:Reply-To:Subject:To; b=WsXMQS4W/o+KMzL5Ld+vkbsADqZem0X7LgXKHFQxc8ahAT9WK6f82WNfURf0gBA8xxw MtqvaZy3dotyIkw436j9Sr7UFndGr1UsfpRdGCy2MvKK6vQ0OLPcl/O8ijrFeSvffv2dh pp1kvU1MOcBGzbfDYNLgVwFrve2BFcDRzwU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In the FileBufferSave() function, we invoke ShellCloseFile() if "Directory Can Not Be Saved". The ShellCloseFile() function takes a (SHELL_FILE_HANDLE*) parameter called "FileHandle", and correctly passes the de-referenced (*FileHandle) to EFI_SHELL_CLOSE_FILE, which takes a SHELL_FILE_HANDLE. However, FileBufferSave() passes SHELL_FILE_HANDLE to ShellCloseFile(), not the expected (SHELL_FILE_HANDLE*). Correct it. This fixes an actual bug that has remained hidden for two reasons: - pointer-to-VOID converts from/to any pointer-to-object type silently, - the bug is on an error path which has likely never fired in practice. Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Jaben Carsey Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Zhichao Gao --- Notes: tested: edit (saving a file) ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c = b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c index 464f9de38e52..fd324cc4a861 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c @@ -1462,7 +1462,7 @@ FileBufferSave ( =20 if (Info !=3D NULL && Info->Attribute & EFI_FILE_DIRECTORY) { StatusBarSetStatusString (L"Directory Can Not Be Saved"); - ShellCloseFile(FileHandle); + ShellCloseFile (&FileHandle); FreePool(Info); return EFI_LOAD_ERROR; } --=20 2.19.1.3.g30247aa5d201 -=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 (#47418): https://edk2.groups.io/g/devel/message/47418 Mute This Topic: https://groups.io/mt/34180234/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47419+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47419+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749843; cv=none; d=zoho.com; s=zohoarc; b=GAAARxqK+OvSWXLCjD+eWXNX3MY+vRl8gpne6rPXTcluSdYIYBpBBP5IT0wrUF5EcFlxQp6iPexWN9Lr65zcbqWcJrErntvOco0DW6bYU+ijRbVImHCC+30mPbd3xM68IGEYBdmOklACtGY4S/NNjZfCiRJOcRv3f1Rm7ic1X+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749843; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=B3dPG2HWE67mrpgYwQDBOdnyCuvkhF4D5m1VS+NqYc8=; b=aQblE8pxha5x+TWehJVrFdZBUWM6/38v7up0Pqt4I8T4LEFNzk4Svf1U3aaS4lTS5uieF9T47C8f3a4nwzopR0fJgyYWrRGEkGCmIde/5xvcZniPqbxqmpelkJOgTJLiTCITYZj87QvdOLy7qjebCKCFPaHJ6NE5cAZE+gNZ5wI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47419+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749843884348.87845493735074; Tue, 17 Sep 2019 12:50:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id U4NlYY1788612xKdEPFHuKio; Tue, 17 Sep 2019 12:50:43 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:42 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73AA110C6352; Tue, 17 Sep 2019 19:50:42 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 379AF600C4; Tue, 17 Sep 2019 19:50:41 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 32/35] ShellPkg/UefiShellLib: clarify workaround for unfixable EdkShell bug Date: Tue, 17 Sep 2019 21:49:32 +0200 Message-Id: <20190917194935.24322-33-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Tue, 17 Sep 2019 19:50:42 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: CIqr4mX81WbVT4VwHgVDlIRQx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749843; bh=OsgKAE5pnJ9Atn9tvgEnRgDLih7l/LIPtlwGYWOheO0=; h=Cc:Date:From:Reply-To:Subject:To; b=ZnCCjEzYHjQq5Fdf3suhtNnhCd76T1n/4PxgQHyQyTmw6YCZJI3DWMqRBVmvOzIfXPf vCQl7DmR9RH9KRzhS8w8CopEqMVkcTe65xGAFyMAiWe6w16i8bHVIV+kInlY1zHZ9uLB3 j5cijHZ5NgjmWIPnCVZay+JcDEqTlN0odvE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The EDK 1 Shell (available at ) has a bug in its EFI_SHELL_ENVIRONMENT2.Execute() implementation that edk2's UefiShellLib has no choice but to work around. Improve the explanation in the code. Also, document the implicit EFI_HANDLE -> (EFI_HANDLE*) conversion, which happens implicitly after dereferencing ParentHandle, with an explicit cast. In practice, this patch is a no-op. Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Hao A Wu Reviewed-by: Jaben Carsey Reviewed-by: Zhichao Gao --- Notes: build-tested only ShellPkg/Library/UefiShellLib/UefiShellLib.c | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Librar= y/UefiShellLib/UefiShellLib.c index 835d0f88ca74..9f07a58eb23d 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c @@ -1291,9 +1291,27 @@ ShellExecute ( if (mEfiShellEnvironment2 !=3D NULL) { // // Call EFI Shell version. - // Due to oddity in the EFI shell we want to dereference the ParentHan= dle here // - CmdStatus =3D (mEfiShellEnvironment2->Execute(*ParentHandle, + // Due to an unfixable bug in the EdkShell implementation, we must + // dereference "ParentHandle" here: + // + // 1. The EFI shell installs the EFI_SHELL_ENVIRONMENT2 protocol, + // identified by gEfiShellEnvironment2Guid. + // 2. The Execute() member function takes "ParentImageHandle" as first + // parameter, with type (EFI_HANDLE*). + // 3. In the EdkShell implementation, SEnvExecute() implements the + // Execute() member function. It passes "ParentImageHandle" correct= ly to + // SEnvDoExecute(). + // 4. SEnvDoExecute() takes the (EFI_HANDLE*), and passes it directly = -- + // without de-referencing -- to the HandleProtocol() boot service. + // 5. But HandleProtocol() takes an EFI_HANDLE. + // + // Therefore we must + // - de-reference "ParentHandle" here, to mask the bug in + // SEnvDoExecute(), and + // - pass the resultant EFI_HANDLE as an (EFI_HANDLE*). + // + CmdStatus =3D (mEfiShellEnvironment2->Execute((EFI_HANDLE *)*ParentHan= dle, CommandLine, Output)); // --=20 2.19.1.3.g30247aa5d201 -=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 (#47419): https://edk2.groups.io/g/devel/message/47419 Mute This Topic: https://groups.io/mt/34180236/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47420+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47420+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749845; cv=none; d=zoho.com; s=zohoarc; b=Gcbj5syCzHWMhJgyvge8k4rogqQx6DdlU5wnLB2y2JefKmFwq0u/TBbuZoXssUrVj3CWGDx47sBtnBMYAaTeXDh70WLdbx3gcKb+dPYChPkTwEKICiOPzT9XPBaRxyNxD/kYzFf5n+v02Zxswr7F1t5nAnTnPYuxX3HwvmIk5iI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749845; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=0E2AG/DHlwlcIsLsqIZsGFMTHLC45V4dkNt1CKNiWwA=; b=aaQ6+LPddG3OZCnw4200SrKAqYNSO0QK7OsOjF/c0U6QgwLvS+12X7VDoHFOZU+pZ6StaZKOIVct23ee3f7FCz2j/ojga6Fps9+NxWr3qlmCtd8rHnSJIyDcOUlA4IkHRF+lCYr6vDszwblwfWH2ToMVkMCKs8NTPg0RPBuHw38= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47420+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749845341799.2807879847679; Tue, 17 Sep 2019 12:50:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id RQgrYY1788612xdqn9wNyHwD; Tue, 17 Sep 2019 12:50:45 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:44 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1843C10F09; Tue, 17 Sep 2019 19:50:44 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2765600C8; Tue, 17 Sep 2019 19:50:42 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Achin Gupta , Jiewen Yao , Supreeth Venkatesh Subject: [edk2-devel] [PATCH 33/35] StandaloneMmPkg/Core: stop abusing EFI_HANDLE for FwVolHeader tracking Date: Tue, 17 Sep 2019 21:49:33 +0200 Message-Id: <20190917194935.24322-34-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 17 Sep 2019 19:50:44 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: BFitWO16hDcfeA6I4sBVgeIEx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749845; bh=h0E4E/5UHLkJqK93DWkbE1BWv1cyc58idFidTT1DbB0=; h=Cc:Date:From:Reply-To:Subject:To; b=ASrQwprFiQ3V2ME6euDTbwQYr0ZILhpFz9+WMz+Z+oHz05CmhdOX9iPVTH5VrH3em6f Wer1tn2JQ75OcyySsuAP8d7w0PSzzAGAvmQmXdHu6+nSpaZ4aTIpjpCtiIaFlR2EZp6mh 8xCbu8VyPwavWxOEDfJx9pcrvBxUVVKjbnA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The FvHasBeenProcessed() and FvIsBeingProcesssed() functions make sure that every firmware volume is processed only once (every driver in every firmware volume should be discovered only once). For this, the functions use a linked list. In MdeModulePkg's DXE Core and SMM Core, the key used for identifying those firmware volumes that have been processed is the EFI_HANDLE on which the DXE or SMM firmware volume protocol is installed. In the StandaloneMmPkg core however, the key is the address of the firmware volume header; that is, it has type (EFI_FIRMWARE_VOLUME_HEADER*). (EFI_FIRMWARE_VOLUME_HEADER*) has nothing to do with EFI_HANDLE. EFI_HANDLE just happens to be specified as (VOID*), and therefore the conversion between (EFI_FIRMWARE_VOLUME_HEADER*) and EFI_HANDLE is silent. (The FvHasBeenProcessed() and FvIsBeingProcesssed() functions were likely copied verbatim from MdeModulePkg's DXE Core and/or the SMM Core, and not flagged by the compiler in StandaloneMmPkg due to UEFI regrettably specifying EFI_HANDLE as (VOID*), thereby enabling the above implicit conversion.) We should not exploit this circumstance. Represent the key type faithfully instead. This is a semantic fix; there is no change in operation. Cc: Achin Gupta Cc: Jiewen Yao Cc: Supreeth Venkatesh Signed-off-by: Laszlo Ersek Reviewed-by: Achin Gupta Reviewed-by: Hao A Wu Reviewed-by: Jiewen Yao --- Notes: build-tested only StandaloneMmPkg/Core/StandaloneMmCore.h | 2 +- StandaloneMmPkg/Core/Dispatcher.c | 80 +++++++++++--------- StandaloneMmPkg/Core/FwVol.c | 16 ++-- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.h b/StandaloneMmPkg/Core= /StandaloneMmCore.h index dcf91bc5e916..23ddbe169faf 100644 --- a/StandaloneMmPkg/Core/StandaloneMmCore.h +++ b/StandaloneMmPkg/Core/StandaloneMmCore.h @@ -67,7 +67,7 @@ typedef struct { =20 LIST_ENTRY ScheduledLink; // mScheduledQueue =20 - EFI_HANDLE FvHandle; + EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; EFI_GUID FileName; VOID *Pe32Data; UINTN Pe32DataSize; diff --git a/StandaloneMmPkg/Core/Dispatcher.c b/StandaloneMmPkg/Core/Dispa= tcher.c index 3788389f95ed..9853445a64a1 100644 --- a/StandaloneMmPkg/Core/Dispatcher.c +++ b/StandaloneMmPkg/Core/Dispatcher.c @@ -5,7 +5,7 @@ is added to the mDiscoveredList. The Before, and After Depex a= re pre-processed as drivers are added to the mDiscoveredList. If = an Apriori file exists in the FV those drivers are addeded to the - mScheduledQueue. The mFvHandleList is used to make sure a + mScheduledQueue. The mFwVolList is used to make sure a FV is only processed once. =20 Step #2 - Dispatch. Remove driver from the mScheduledQueue and load and @@ -40,13 +40,13 @@ // // MM Dispatcher Data structures // -#define KNOWN_HANDLE_SIGNATURE SIGNATURE_32('k','n','o','w') +#define KNOWN_FWVOL_SIGNATURE SIGNATURE_32('k','n','o','w') =20 typedef struct { - UINTN Signature; - LIST_ENTRY Link; // mFvHandleList - EFI_HANDLE Handle; -} KNOWN_HANDLE; + UINTN Signature; + LIST_ENTRY Link; // mFwVolList + EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; +} KNOWN_FWVOL; =20 // // Function Prototypes @@ -86,9 +86,10 @@ LIST_ENTRY mDiscoveredList =3D INITIALIZE_LIST_HEAD_VAR= IABLE (mDiscoveredList); LIST_ENTRY mScheduledQueue =3D INITIALIZE_LIST_HEAD_VARIABLE (mScheduledQ= ueue); =20 // -// List of handles who's Fv's have been parsed and added to the mFwDriverL= ist. +// List of firmware volume headers whose containing firmware volumes have = been +// parsed and added to the mFwDriverList. // -LIST_ENTRY mFvHandleList =3D INITIALIZE_LIST_HEAD_VARIABLE (mFvHandleList= ); +LIST_ENTRY mFwVolList =3D INITIALIZE_LIST_HEAD_VARIABLE (mFwVolList); =20 // // Flag for the MM Dispacher. TRUE if dispatcher is execuing. @@ -769,26 +770,30 @@ MmInsertOnScheduledQueueWhileProcessingBeforeAndAfter= ( } =20 /** - Return TRUE if the Fv has been processed, FALSE if not. + Return TRUE if the firmware volume has been processed, FALSE if not. =20 - @param FvHandle The handle of a FV that's being tested + @param FwVolHeader The header of the firmware volume that's b= eing + tested. =20 - @retval TRUE Fv protocol on FvHandle has been processed - @retval FALSE Fv protocol on FvHandle has not yet been - processed + @retval TRUE The firmware volume denoted by FwVolHeader= has + been processed + @retval FALSE The firmware volume denoted by FwVolHeader= has + not yet been processed =20 **/ BOOLEAN FvHasBeenProcessed ( - IN EFI_HANDLE FvHandle + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader ) { LIST_ENTRY *Link; - KNOWN_HANDLE *KnownHandle; + KNOWN_FWVOL *KnownFwVol; =20 - for (Link =3D mFvHandleList.ForwardLink; Link !=3D &mFvHandleList; Link = =3D Link->ForwardLink) { - KnownHandle =3D CR (Link, KNOWN_HANDLE, Link, KNOWN_HANDLE_SIGNATURE); - if (KnownHandle->Handle =3D=3D FvHandle) { + for (Link =3D mFwVolList.ForwardLink; + Link !=3D &mFwVolList; + Link =3D Link->ForwardLink) { + KnownFwVol =3D CR (Link, KNOWN_FWVOL, Link, KNOWN_FWVOL_SIGNATURE); + if (KnownFwVol->FwVolHeader =3D=3D FwVolHeader) { return TRUE; } } @@ -796,28 +801,29 @@ FvHasBeenProcessed ( } =20 /** - Remember that Fv protocol on FvHandle has had it's drivers placed on the - mDiscoveredList. This fucntion adds entries on the mFvHandleList. Items = are - never removed/freed from the mFvHandleList. + Remember that the firmware volume denoted by FwVolHeader has had its dri= vers + placed on mDiscoveredList. This function adds entries to mFwVolList. Ite= ms + are never removed/freed from mFwVolList. =20 - @param FvHandle The handle of a FV that has been processed + @param FwVolHeader The header of the firmware volume that's b= eing + processed. =20 **/ VOID FvIsBeingProcesssed ( - IN EFI_HANDLE FvHandle + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader ) { - KNOWN_HANDLE *KnownHandle; + KNOWN_FWVOL *KnownFwVol; =20 - DEBUG ((DEBUG_INFO, "FvIsBeingProcesssed - 0x%08x\n", FvHandle)); + DEBUG ((DEBUG_INFO, "FvIsBeingProcesssed - 0x%08x\n", KnownFwVol)); =20 - KnownHandle =3D AllocatePool (sizeof (KNOWN_HANDLE)); - ASSERT (KnownHandle !=3D NULL); + KnownFwVol =3D AllocatePool (sizeof (KNOWN_FWVOL)); + ASSERT (KnownFwVol !=3D NULL); =20 - KnownHandle->Signature =3D KNOWN_HANDLE_SIGNATURE; - KnownHandle->Handle =3D FvHandle; - InsertTailList (&mFvHandleList, &KnownHandle->Link); + KnownFwVol->Signature =3D KNOWN_FWVOL_SIGNATURE; + KnownFwVol->FwVolHeader =3D FwVolHeader; + InsertTailList (&mFwVolList, &KnownFwVol->Link); } =20 /** @@ -842,12 +848,12 @@ FvIsBeingProcesssed ( **/ EFI_STATUS MmAddToDriverList ( - IN EFI_HANDLE FvHandle, - IN VOID *Pe32Data, - IN UINTN Pe32DataSize, - IN VOID *Depex, - IN UINTN DepexSize, - IN EFI_GUID *DriverName + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader, + IN VOID *Pe32Data, + IN UINTN Pe32DataSize, + IN VOID *Depex, + IN UINTN DepexSize, + IN EFI_GUID *DriverName ) { EFI_MM_DRIVER_ENTRY *DriverEntry; @@ -863,7 +869,7 @@ MmAddToDriverList ( =20 DriverEntry->Signature =3D EFI_MM_DRIVER_ENTRY_SIGNATURE; CopyGuid (&DriverEntry->FileName, DriverName); - DriverEntry->FvHandle =3D FvHandle; + DriverEntry->FwVolHeader =3D FwVolHeader; DriverEntry->Pe32Data =3D Pe32Data; DriverEntry->Pe32DataSize =3D Pe32DataSize; DriverEntry->Depex =3D Depex; diff --git a/StandaloneMmPkg/Core/FwVol.c b/StandaloneMmPkg/Core/FwVol.c index 9fe0c257a43a..99ecf4af4714 100644 --- a/StandaloneMmPkg/Core/FwVol.c +++ b/StandaloneMmPkg/Core/FwVol.c @@ -24,22 +24,22 @@ EFI_FV_FILETYPE mMmFileTypes[] =3D { =20 EFI_STATUS MmAddToDriverList ( - IN EFI_HANDLE FvHandle, - IN VOID *Pe32Data, - IN UINTN Pe32DataSize, - IN VOID *Depex, - IN UINTN DepexSize, - IN EFI_GUID *DriverName + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader, + IN VOID *Pe32Data, + IN UINTN Pe32DataSize, + IN VOID *Depex, + IN UINTN DepexSize, + IN EFI_GUID *DriverName ); =20 BOOLEAN FvHasBeenProcessed ( - IN EFI_HANDLE FvHandle + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader ); =20 VOID FvIsBeingProcesssed ( - IN EFI_HANDLE FvHandle + IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader ); =20 EFI_STATUS --=20 2.19.1.3.g30247aa5d201 -=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 (#47420): https://edk2.groups.io/g/devel/message/47420 Mute This Topic: https://groups.io/mt/34180238/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47421+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47421+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749847; cv=none; d=zoho.com; s=zohoarc; b=EtBSrMjeG8NS/RAeGoWQcjQ2LKLTBlP5NGNIpk0OOQ6l1d+WuACSu2FUOuXybZ8ENIInhWQiGpVKn7/SGP2ZdIY1jW7/df01gVpG7m962fpUOHpb6eWfedR6jYfQU8A5/paxhPxk5f9hslytRFUeQCJMovhW5UrsREaK/I4Yu6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749847; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=V9eTHCDQK9hRn4bOil6KDwTk2ZA+7Ek3v/Sn6YVGVmc=; b=de8DDgBuLtn1+x3wUHpjeiokbMMuzOorQ4k7RQWl8YNfz9JPcYZKZVVSRSacpqSITeemAosg7Dv5RkqWGOptInYqg15INhPeh1h6Md7riyXjUakBvL4S7ETkJknCMFJHwDk6vrnOUTKWxHciUkjOSjNGyv9QcGQLgH1FfaqyIbI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47421+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15687498476591008.541882403446; Tue, 17 Sep 2019 12:50:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hFBPYY1788612xHxIkLZe6FV; Tue, 17 Sep 2019 12:50:46 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:46 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B755830821AE; Tue, 17 Sep 2019 19:50:45 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77B11600C8; Tue, 17 Sep 2019 19:50:44 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Benjamin You , Guo Dong , Maurice Ma Subject: [edk2-devel] [PATCH 34/35] UefiPayloadPkg/BlSupportPei: fix MMCONFIG assignment from XSDT Date: Tue, 17 Sep 2019 21:49:34 +0200 Message-Id: <20190917194935.24322-35-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 17 Sep 2019 19:50:45 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: b4CxuRH9lKYthNuArykDRA8qx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749846; bh=ibME326w3lg0uEX9oDm5jUyyvJQtSUhnVMSoKiSWbKY=; h=Cc:Date:From:Reply-To:Subject:To; b=Q1NxrBimAaMO2Ybzq98pl/NCmZuGL2m+0gAIH0f6Q7jvzORuFL7RSLuExoTaML1tkHC lpyu7EJziDSZGcn/4U4sgzg8XUr/APWbHlTXYWspxFsjhWKdRfJPU5YHtR+7Xb67Xy3q0 3SDff6oN70R6tXb7X7Mx50QzbrxaRJm3FEs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" (This patch is unrelated to the rest of this series; its purpose is to enable building the UefiPayloadPkg DSC files with GCC.) When building "UefiPayloadPkg/UefiPayloadPkgIa32.dsc" with GCC48 for the DEBUG target, the compiler reports that "Entry32" may be used uninitialized in ParseAcpiInfo(), in the XSDT branch. Code inspection proves the compiler right. In the XSDT branch, the code from the RSDT branch must have been duplicated, and "Entry32" references were replaced with "Entry64" -- except where "MmCfgHdr" is assigned. Fix this bug by introducing a helper variable called "Signature", so that we have to refer to "Entry32" or "Entry64" only once per loop body. Cc: Benjamin You Cc: Guo Dong Cc: Maurice Ma Signed-off-by: Laszlo Ersek Reviewed-by: Guo Dong Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only UefiPayloadPkg/BlSupportPei/BlSupportPei.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/UefiPayloadPkg/BlSupportPei/BlSupportPei.c b/UefiPayloadPkg/Bl= SupportPei/BlSupportPei.c index 90433b609f22..22972453117a 100644 --- a/UefiPayloadPkg/BlSupportPei/BlSupportPei.c +++ b/UefiPayloadPkg/BlSupportPei/BlSupportPei.c @@ -164,6 +164,7 @@ ParseAcpiInfo ( UINT64 *Entry64; UINTN Entry64Num; UINTN Idx; + UINT32 *Signature; EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER *MmCfgHdr; EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCAT= ION_STRUCTURE *MmCfgBase; =20 @@ -181,13 +182,14 @@ ParseAcpiInfo ( Entry32 =3D (UINT32 *)(Rsdt + 1); Entry32Num =3D (Rsdt->Length - sizeof(EFI_ACPI_DESCRIPTION_HEADER)) >>= 2; for (Idx =3D 0; Idx < Entry32Num; Idx++) { - if (*(UINT32 *)(UINTN)(Entry32[Idx]) =3D=3D EFI_ACPI_3_0_FIXED_ACPI_= DESCRIPTION_TABLE_SIGNATURE) { - Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)(Entr= y32[Idx]); + Signature =3D (UINT32 *)(UINTN)Entry32[Idx]; + if (*Signature =3D=3D EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGN= ATURE) { + Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)Signature; DEBUG ((DEBUG_INFO, "Found Fadt in Rsdt\n")); } =20 - if (*(UINT32 *)(UINTN)(Entry32[Idx]) =3D=3D EFI_ACPI_5_0_PCI_EXPRESS= _MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE= ) { - MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TA= BLE_HEADER *)(UINTN)(Entry32[Idx]); + if (*Signature =3D=3D EFI_ACPI_5_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGU= RATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE) { + MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TA= BLE_HEADER *)Signature; DEBUG ((DEBUG_INFO, "Found MM config address in Rsdt\n")); } =20 @@ -205,13 +207,14 @@ ParseAcpiInfo ( Entry64 =3D (UINT64 *)(Xsdt + 1); Entry64Num =3D (Xsdt->Length - sizeof(EFI_ACPI_DESCRIPTION_HEADER)) >>= 3; for (Idx =3D 0; Idx < Entry64Num; Idx++) { - if (*(UINT32 *)(UINTN)(Entry64[Idx]) =3D=3D EFI_ACPI_3_0_FIXED_ACPI_= DESCRIPTION_TABLE_SIGNATURE) { - Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)(Entr= y64[Idx]); + Signature =3D (UINT32 *)(UINTN)Entry64[Idx]; + if (*Signature =3D=3D EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGN= ATURE) { + Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)Signature; DEBUG ((DEBUG_INFO, "Found Fadt in Xsdt\n")); } =20 - if (*(UINT32 *)(UINTN)(Entry64[Idx]) =3D=3D EFI_ACPI_5_0_PCI_EXPRESS= _MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE= ) { - MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TA= BLE_HEADER *)(UINTN)(Entry32[Idx]); + if (*Signature =3D=3D EFI_ACPI_5_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGU= RATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE) { + MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TA= BLE_HEADER *)Signature; DEBUG ((DEBUG_INFO, "Found MM config address in Xsdt\n")); } =20 --=20 2.19.1.3.g30247aa5d201 -=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 (#47421): https://edk2.groups.io/g/devel/message/47421 Mute This Topic: https://groups.io/mt/34180239/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 Tue Apr 30 23:56:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47422+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47422+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749848; cv=none; d=zoho.com; s=zohoarc; b=ntbQ3zf/AnpoHwoIkieTDQFmYbykqPe6DkA9ZWp6rZZLTCpaD1iV3+b7dPQEPbDwGt9CEfabODyOLfA07ilCn2r4xCPg22QxBlsqIaxNRrJ0ii0jHN5npBYOGn7A5BUzIDTsY6Vqzloy8JMLa8l9lAAamiMacwqwmLyIDX4ciXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749848; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2t3DmnrAaJWM/b2SpDAbORHZYZwLMc7xhwSsDiab7jY=; b=M6w347F8io+SJyFmjQCJhW5NNsHSHgsK87W6CJp4+84Gp0rKtTkGvPUZyQSpqbtJzxIdJSlB4N836E1Nj/iZowXIDBgT3YgO6pslM6hI2+K0ETDu+0KuUgF85QTSwxx5IzvD7LDoLWk0Rzy4Fr/t22duostS3veYQ9CqBhg5ybo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47422+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749848533469.5938048604871; Tue, 17 Sep 2019 12:50:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9ByhYY1788612xcJ59JNyq3n; Tue, 17 Sep 2019 12:50:48 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:47 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A948307D848; Tue, 17 Sep 2019 19:50:47 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E08F600C4; Tue, 17 Sep 2019 19:50:45 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Benjamin You , Guo Dong , Maurice Ma Subject: [edk2-devel] [PATCH 35/35] UefiPayloadPkg/BlSupportDxe: fix ReserveResourceInGcd() calls Date: Tue, 17 Sep 2019 21:49:35 +0200 Message-Id: <20190917194935.24322-36-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 17 Sep 2019 19:50:47 +0000 (UTC) Precedence: Bulk List-Unsubscribe: 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,lersek@redhat.com X-Gm-Message-State: pcjdYWToorPrgLm6EwNInlOVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749848; bh=OMjt+0SceN5shZ8sfuaKFhXZLlgFo2uXRY1bCvbKTFk=; h=Cc:Date:From:Reply-To:Subject:To; b=PBBEId0TwCpNo5kEGxLQ+WWghd/G4JXF53z9eNionUan+JSmZHVVoLE4j3oxY1A7P1f voI3vU/sSPffELE7rIWTjGaWIwIBVTiujUNw8n51SgyvPkhb51SghJ48TDKOjVdtMCIOD Ne+n0FEYgApnqKH6CL3/PHdYHRpqTTUwxKo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The last parameter of ReserveResourceInGcd() is "ImageHandle", forwarded in turn to gDS->AllocateMemorySpace() or gDS->AllocateIoSpace() as "owner" image handle. But BlDxeEntryPoint() passes "SystemTable" as "ImageHandle". Compilers have not flagged it because EFI_HANDLE (the type of "ImageHandle") is unfortunately specified as (VOID*), and (EFI_SYSTEM_TABLE*) converts to (VOID*) silently. Hand the entry point function's "ImageHandle" parameter to ReserveResourceInGcd(). This fixes an actual bug. Cc: Benjamin You Cc: Guo Dong Cc: Maurice Ma Signed-off-by: Laszlo Ersek Reviewed-by: Guo Dong Reviewed-by: Hao A Wu Reviewed-by: Philippe Mathieu-Daude --- Notes: build-tested only UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c b/UefiPayloadPkg/Bl= SupportDxe/BlSupportDxe.c index bcee4cd9bc41..28dfc8fc5545 100644 --- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c +++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c @@ -106,10 +106,10 @@ BlDxeEntryPoint ( // // Report MMIO/IO Resources // - Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFEC00000, SIZE_4KB, 0, SystemTable); // IOAPIC + Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFEC00000, SIZE_4KB, 0, ImageHandle); // IOAPIC ASSERT_EFI_ERROR (Status); =20 - Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFED00000, SIZE_1KB, 0, SystemTable); // HPET + Status =3D ReserveResourceInGcd (TRUE, EfiGcdMemoryTypeMemoryMappedIo, 0= xFED00000, SIZE_1KB, 0, ImageHandle); // HPET ASSERT_EFI_ERROR (Status); =20 // --=20 2.19.1.3.g30247aa5d201 -=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 (#47422): https://edk2.groups.io/g/devel/message/47422 Mute This Topic: https://groups.io/mt/34180240/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-