diff options
| author |   H. Peter Anvin <hpa@linux.intel.com> | 2014-08-11 13:58:54 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-08-11 13:58:54 -0700 |
| commit | 9e13bcf7e0981f1db0c8c8255ac17d5f898903e9 (patch) | |
| tree | 2bb16d5bceab26b92ea68c2b895ce4a353d9338a /drivers/firmware/efi/libstub/fdt.c | |
| parent | x86/efi: Fix 3DNow optimization build failure in EFI stub (diff) | |
| parent | x86/efi: Enforce CONFIG_RELOCATABLE for EFI boot stub (diff) | |
| download | linux-dev-9e13bcf7e0981f1db0c8c8255ac17d5f898903e9.tar.xz linux-dev-9e13bcf7e0981f1db0c8c8255ac17d5f898903e9.zip | |
Merge tag 'efi-urgent' into x86/efi
* Enforce CONFIG_RELOCATABLE for the x86 EFI boot stub, otherwise
it's possible to overwrite random pieces of unallocated memory during
kernel decompression, leading to machine resets.
Resolved Conflicts:
arch/x86/Kconfig
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/firmware/efi/libstub/fdt.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 86d2934840e2..a56bb3528755 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -57,7 +57,7 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, */ prev = 0; for (;;) { - const char *type, *name; + const char *type; int len; node = fdt_next_node(fdt, prev, NULL); |