From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lmiZ7-0005Y2-8m for mharc-grub-devel@gnu.org; Fri, 28 May 2021 15:54:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmiZ5-0005XS-M1 for grub-devel@gnu.org; Fri, 28 May 2021 15:54:39 -0400 Received: from mout.gmx.net ([212.227.17.22]:44967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmiZ0-0004GI-Sf for grub-devel@gnu.org; Fri, 28 May 2021 15:54:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1622231667; bh=MOMtVVu7owTjn1zmUgRkJFj0psPrRXVWQl4tx5aTvZ4=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=Nn+I2L+ktiC/Q3pX5rFGTvNhWPqFGVG//Jh4XcGtjpnB3Es1I+Qy5dbr1BrglqwHR Mx+3cxxIJDqtUxWgj5xcFXfSTKs0Vzzi0pw1C6pi/DRTLZW9Jqxsk+uRKkcsnZGaWt V/59IJeFqk9bJPfWsuSlGiwEFRSR4lgohMl5Tfng= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.35] ([62.143.247.63]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5GE1-1lNFkU2pD3-011Adq; Fri, 28 May 2021 21:54:27 +0200 Subject: Re: [PATCH 8/8] linux: Make load_file2_guid and device_path_guid static To: Nikita Ermakov , GRUB development mailing list Cc: Ard Biesheuvel , Atish Patra , Daniel Kiper , Leif Lindholm References: <20210528130457.13501-1-arei@altlinux.org> <20210528130457.13501-9-arei@altlinux.org> From: Heinrich Schuchardt Message-ID: <04c86651-d44e-4326-6520-34ce3ea30ce3@gmx.de> Date: Fri, 28 May 2021 21:54:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210528130457.13501-9-arei@altlinux.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:57ZXJQWg4ISs8Doio3j+wzzAsWK/IvpSnKUp+a/Bb8xPjxHd9s8 RnTLIz10tMLyxfoKPPguWfhAUYVH3nuGxLCrrHc6oPVs0fZEA+DuqWW3+z3rIq3bi6DMk3W ac4JXblIl9Cavp4X6wduabwqbRCkKpz9Z6s4AP+WHPkYDdsQcOZkqMnN5g6OtnkJD64k1sI KYXw3mxSmRg0bU3nNOd0w== X-UI-Out-Filterresults: notjunk:1;V03:K0:ij4WDJJ9FJc=:VJgtDPbhZe2rRpBHN4H+zP 3OQavo+wDfkJ/0pPpalxz3+guMvs5YAvULt5pz1YKFggasLquuDM/BLEXyc83eRbvICJ71wkp yOqiNBWjXpNL5KXzKUBVagzsAjLV0ZvI7nrH3oXERMfxbDS9xBwFdLTnTx3cLkrbiS8J7XSOm aNCYguRK0pNOwJGsUocNxezDEWChjeQWpn5b9jDA++qneKOjVn7g95Vfo/ssU4Yeb5W7Z86zE A9g3RZR0WUsRCcQ3Tcxwsd4L9YB5ywzrZAOoA/nVrnoxecOD3KWDMVNQOpfEOoxffAgRUCCov J1qiqIimOW1ba5P1V8PdgFpUuTGdfMCX4YSOzBjCUiRNi3wIhqcxMp4L3RUYWXY4wi76ndzJX STtSzf4M77y02GXEovV0Clcn0Pa4r+Z3jwDiz0wbAQ4w849f4DYoTrhCpsloDMlAkE8PEgWzN oo8LgKvPI9OcAGhGwggHV4SdtndR54qCQPJKzj2jwSt4HrFoHJhPfkEugkao87MJEsQX5DhhU AcP5CV30d3YSUybHYi9L4MJifLhdj/yCjzQFEx2NgTWrPNXcWSdK5Lf07KgLpt/9KSwwK4XtQ b8qjjg06KhfyoANAMzE4wWk32slFvTFtb0IVAYo/B9jA/3GQYOGOEDAEPL2Pf6sVZipGiHzXw 1JaNvFRd+6fPzhOxpuvxy6DJxe70oClIjUPwa42vlVW3jxzz2GTEQy7R+lL3qdk/MjfHLX/di E6wHH8FbtOKu7YhsYr29ve97GywGOQBb1PLe3zm6lohwjF7E3ej5/FNJ6h81pBROBSHafsxZE kNNQkkXjo70pMqiEZ9lP1i1C5lf0Am9AI2Hd0c/XEnug0JfE6amhbTa4VqB03W19O6M0JnWFR QuBBsUn6T8nJ/a65QfvU6HquctqaAhu1PR4N9P4T74yHHEyI0FDmsT2f2BNHXmtjKLSZmUdXx saShqipcuTa2uIzeCGYf3xJlmrkZeg7tkHBNTOS82S/MbPYejsr/28asdXrrqz4PJ+q1wW3TV 7l3NHu+b33vPggNJLt1g2GWzyVElsobpzVfENyHYKhm1iovYclKbz1LpAI5EkH1ycCtpslTRE MxX0bIxIxbqxbsfDF1YU8jgnXK3hqMxVKyzQs9Ud4RDT6ofaJWglaKONPEAZFHgM9IZALlY4w ZjuXtqTTfaeznruXWwJVMn2oG7vkRXUdV4eG+AOUiHTHNlUR5DspNH+NTey6ki4o75Uuo= Received-SPF: pass client-ip=212.227.17.22; envelope-from=xypron.glpk@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 19:54:39 -0000 On 5/28/21 3:04 PM, Nikita Ermakov wrote: > The load_file2_guid and device_path_guid variables must be preserved > outside of the function scope. It is not helpful to introduce a bug in patch 3 and later resolve it in patch 8. Please, squash the two patches into one. Best regards Heinrich > > Signed-off-by: Nikita Ermakov > --- > grub-core/loader/efi/linux.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c > index 7c71d0336..8fd8e54e1 100644 > --- a/grub-core/loader/efi/linux.c > +++ b/grub-core/loader/efi/linux.c > @@ -51,6 +51,8 @@ static grub_addr_t initrd_end; > static struct grub_linux_initrd_context initrd_ctx =3D { 0, 0, 0 }; > static grub_efi_handle_t initrd_lf2_handle; > static int initrd_use_loadfile2; > +static grub_efi_guid_t load_file2_guid =3D GRUB_EFI_LOAD_FILE2_PROTOCOL= _GUID; > +static grub_efi_guid_t device_path_guid =3D GRUB_EFI_DEVICE_PATH_GUID; > > grub_err_t > grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) > @@ -330,8 +332,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((= unused)), > { > int initrd_size, initrd_pages; > void *initrd_mem =3D NULL; > - grub_efi_guid_t load_file2_guid =3D GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID= ; > - grub_efi_guid_t device_path_guid =3D GRUB_EFI_DEVICE_PATH_GUID; > grub_efi_boot_services_t *b; > grub_efi_status_t status; > >