diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-03-15 19:13:25 +0000 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-01 09:11:10 -0700 |
| commit | 30dc0d0fe5d08396dbdaa2d70972149131340960 (patch) | |
| tree | 7c875693d5e31a18ebe635612503be876472c96e | |
| parent | fb21affa49204acd409328415b49bfe90136653c (diff) | |
| download | linux-stable-30dc0d0fe5d08396dbdaa2d70972149131340960.tar.gz linux-stable-30dc0d0fe5d08396dbdaa2d70972149131340960.tar.bz2 linux-stable-30dc0d0fe5d08396dbdaa2d70972149131340960.zip | |
x86, efi: Only close open files in error path
The loop at the 'close_handles' label in handle_ramdisks() should be
using 'i', which represents the number of initrd files that were
successfully opened, not 'nr_initrds' which is the number of initrd=
arguments passed on the command line.
Currently, if we execute the loop to close all file handles and we
failed to open any initrds we'll try to call the close function on a
garbage pointer, causing the machine to hang.
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1331907517-3985-2-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 2c14e76bb4c7..52a4e667b258 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -674,7 +674,7 @@ free_initrd_total: low_free(initrd_total, initrd_addr); close_handles: - for (k = j; k < nr_initrds; k++) + for (k = j; k < i; k++) efi_call_phys1(fh->close, initrds[k].handle); free_initrds: efi_call_phys1(sys_table->boottime->free_pool, initrds); |