Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744AbdFNXgB (ORCPT ); Wed, 14 Jun 2017 19:36:01 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:32996 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752121AbdFNXf6 (ORCPT ); Wed, 14 Jun 2017 19:35:58 -0400 From: Maniaxx Subject: Re: [PATCH 4.11 049/150] efi/bgrt: Skip efi_bgrt_init() in case of non-EFI boot To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Sabrina Dubroca , Dave Young , Ard Biesheuvel , Matt Fleming , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, Ingo Molnar Newsgroups: gmane.linux.kernel,gmane.linux.kernel.stable,gmane.linux.kernel.efi References: <20170612152519.404936272@linuxfoundation.org> <20170612152521.552786146@linuxfoundation.org> Message-ID: <9a71b41b-5e6a-e0a5-776d-829792e7f998@gmail.com> Date: Thu, 15 Jun 2017 01:34:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170612152521.552786146@linuxfoundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2392 Lines: 69 On 12.06.2017 at 17:24 wrote Greg Kroah-Hartman: > 4.11-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Dave Young > > commit 7425826f4f7ac60f2538b06a7f0a5d1006405159 upstream. > > Sabrina Dubroca reported an early panic: > > BUG: unable to handle kernel paging request at ffffffffff240001 > IP: efi_bgrt_init+0xdc/0x134 > > [...] > > ---[ end Kernel panic - not syncing: Attempted to kill the idle task! > > ... which was introduced by: > > 7b0a911478c7 ("efi/x86: Move the EFI BGRT init code to early init code") > > The cause is that on this machine the firmware provides the EFI ACPI BGRT > table even on legacy non-EFI bootups - which table should be EFI only. > > The garbage BGRT data causes the efi_bgrt_init() panic. > > Add a check to skip efi_bgrt_init() in case non-EFI bootup to work around > this firmware bug. > > Tested-by: Sabrina Dubroca > Signed-off-by: Dave Young > Signed-off-by: Ard Biesheuvel > Signed-off-by: Matt Fleming > Cc: Linus Torvalds > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Cc: linux-efi@vger.kernel.org > Fixes: 7b0a911478c7 ("efi/x86: Move the EFI BGRT init code to early init code") > Link: http://lkml.kernel.org/r/20170526113652.21339-6-matt@codeblueprint.co.uk > [ Rewrote the changelog to be more readable. ] > Signed-off-by: Ingo Molnar > Signed-off-by: Greg Kroah-Hartman > > --- > arch/x86/platform/efi/efi-bgrt.c | 3 +++ > 1 file changed, 3 insertions(+) > > --- a/arch/x86/platform/efi/efi-bgrt.c > +++ b/arch/x86/platform/efi/efi-bgrt.c > @@ -36,6 +36,9 @@ void __init efi_bgrt_init(struct acpi_ta > if (acpi_disabled) > return; > > + if (!efi_enabled(EFI_BOOT)) > + return; > + > if (table->length < sizeof(bgrt_tab)) { > pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n", > table->length, sizeof(bgrt_tab)); > > > The patch is ok but it only fixes BIOS systems. To fix the regression above (commit 7b0a911478c7) for EFI systems it needs this patch as well: commit 792ef14df5c585c19b2831673a077504a09e5203 master (efi: Fix boot panic because of invalid BGRT image address)