]> git.baikalelectronics.ru Git - kernel.git/commit
efi/libstub: Fix boundary checking in efi_high_alloc()
authorYinghai Lu <yinghai@kernel.org>
Fri, 20 Feb 2015 04:18:03 +0000 (20:18 -0800)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 24 Feb 2015 18:46:03 +0000 (18:46 +0000)
commit970840c937f90cd6f4f71a9234783977fbc0296a
tree174badf33371a6d7c55347508e52196930900bb2
parentc9b0331b8b29e2dba37993df90875045af4839b1
efi/libstub: Fix boundary checking in efi_high_alloc()

While adding support loading kernel and initrd above 4G to grub2 in legacy
mode, I was referring to efi_high_alloc().
That will allocate buffer for kernel and then initrd, and initrd will
use kernel buffer start as limit.

During testing found two buffers will be overlapped when initrd size is
very big like 400M.

It turns out efi_high_alloc() boundary checking is not right.
end - size will be the new start, and should not compare new
start with max, we need to make sure end is smaller than max.

[ Basically, with the current efi_high_alloc() code it's possible to
  allocate memory above 'max', because efi_high_alloc() doesn't check
  that the tail of the allocation is below 'max'.

  If you have an EFI memory map with a single entry that looks like so,

   [0xc0000000-0xc0004000]

  And want to allocate 0x3000 bytes below 0xc0003000 the current code
  will allocate [0xc0001000-0xc0004000], not [0xc0000000-0xc0003000]
  like you would expect. - Matt ]

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
drivers/firmware/efi/libstub/efi-stub-helper.c