Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755112AbaDKHQh (ORCPT ); Fri, 11 Apr 2014 03:16:37 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:48561 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755015AbaDKHQf (ORCPT ); Fri, 11 Apr 2014 03:16:35 -0400 Date: Fri, 11 Apr 2014 08:16:22 +0100 From: Matt Fleming To: "H. Peter Anvin" , Ingo Molnar Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] EFI urgent fixes Message-ID: <20140411071622.GB17021@console-pimps.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Guys, please pull the following. One of the fixes is for a regression introduced during the merge window. The other two are bugs that have existed in the EFI boot stub for a while, but which have only just been reported. I'm going to take care of submitting the later two to stable separately because they won't apply cleanly as-is. The following changes since commit 204b0a1a4b92612c957a042df1a3be0e9cc79391: x86, efi: Abstract x86 efi_early calls (2014-03-26 11:30:03 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-urgent for you to fetch changes up to 47514c996fac5e6f13ef3a4c5e23f1c5cffabb7b: efi: Pass correct file handle to efi_file_{read,close} (2014-04-10 21:20:03 +0100) ---------------------------------------------------------------- * Fix EFI boot regression introduced during the merge window where the firmware was reading random values from the stack because we were passing a pointer to the wrong object type. * Kernel corruption has been reported when booting with the EFI boot stub which was tracked down to setting a bogus value for bp->hdr.code32_start, resulting in corruption during relocation. * Olivier Martin reported that the wrong file handles were being passed to efi_file_(read|close), which works for x86 by luck due to the way that the FAT driver is implemented, but doesn't work on ARM. ---------------------------------------------------------------- Matt Fleming (3): x86/efi: Fix boot failure with EFI stub x86/efi: Correct EFI boot stub use of code32_start efi: Pass correct file handle to efi_file_{read,close} arch/x86/boot/compressed/eboot.c | 19 ++++++++++--------- arch/x86/boot/compressed/head_32.S | 8 ++------ arch/x86/boot/compressed/head_64.S | 9 +++------ drivers/firmware/efi/efi-stub-helper.c | 6 +++--- 4 files changed, 18 insertions(+), 24 deletions(-) -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/