Bug#616638: using the "linux" command twice in a row causes grub-efi-amd64 to hang

[Colin Watson]

tags 616638 fixed-upstream
thanks

On Tue, Mar 08, 2011 at 10:12:25AM -0500, Daniel Kahn Gillmor wrote:
> On 03/08/2011 05:26 AM, Colin Watson wrote:
> > There's a fairly small number of differences between BIOS and EFI that
> > might be relevant to the 'linux' command.  One of them is memory
> > allocation, so I looked through that code path, and I noticed one bug by
> > inspection that could certainly cause your problem.  Could you try this
> > patch?
> 
> Gah.  i no longer have physical access to the EFI machine i ran across
> this bug on, so i can't test your proposed patch in the near future.
> 
> Actually, i ended up (unhappily) reverting to grub-pc on that machine
> using BIOS emulation under rEFIt because the linux kernel was too buggy
> under EFI to even get a working keyboard.  (http://bugs.debian.org/617377)
> 
> And i suspect that the machine is now in active use by its owner, so my
> opportunity to break the machine's ability to boot for the sake of
> testing bootloaders might have passed altogether :(
> 
> If i can get my hands on another macbook that i *can* break, i'll be
> sure to try out your patch.  Maybe (hopefully?) someone else with better
> access to the hardware can beat me to it.

OK.  Well, I've gone ahead and committed this since it seems obviously
correct, and I'll speculatively mark it as closing this bug; you can
always reopen it later if that turns out not to be the case.

2011-03-09  Colin Watson  <cjwatson at ubuntu.com>

	* grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align
	cached mmap_size, so that this works correctly when called multiple
	times.
	Reported by: Daniel Kahn Gillmor.  Should fix Debian bug #616638.

Thanks,

-- 
Colin Watson                                       [cjwatson at debian.org]