diff options
| author | H. Peter Anvin | 2013-01-26 01:31:21 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2013-01-26 01:31:21 +0100 |
| commit | 7b5c4a65cc27f017c170b025f8d6d75dabb11c6f (patch) | |
| tree | 05deacbc66a9f5c27147a6ea975211ae82281044 /arch/x86/platform/efi | |
| parent | Merge branch 'x86/mm' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/tip/tip... (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | kernel-qcow2-linux-7b5c4a65cc27f017c170b025f8d6d75dabb11c6f.tar.gz kernel-qcow2-linux-7b5c4a65cc27f017c170b025f8d6d75dabb11c6f.tar.xz kernel-qcow2-linux-7b5c4a65cc27f017c170b025f8d6d75dabb11c6f.zip | |
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not
present in the existing branch based on v3.7-rc5, so merge in the
current upstream from Linus.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/platform/efi')
| -rw-r--r-- | arch/x86/platform/efi/efi-bgrt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c index f6a0c1b8e518..d9c1b95af17c 100644 --- a/arch/x86/platform/efi/efi-bgrt.c +++ b/arch/x86/platform/efi/efi-bgrt.c @@ -39,6 +39,8 @@ void efi_bgrt_init(void) if (ACPI_FAILURE(status)) return; + if (bgrt_tab->header.length < sizeof(*bgrt_tab)) + return; if (bgrt_tab->version != 1) return; if (bgrt_tab->image_type != 0 || !bgrt_tab->image_address) |