]> git.baikalelectronics.ru Git - kernel.git/commit
efi: Pass correct file handle to efi_file_{read,close}
authorMatt Fleming <matt.fleming@intel.com>
Thu, 10 Apr 2014 13:11:45 +0000 (14:11 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Thu, 10 Apr 2014 20:20:03 +0000 (21:20 +0100)
commit04e4f59f5d7fa8bba7b60a7b1cf3e105d6cb88fa
treecd8abfa789364bf25eeb2edc415a16ee08a9a25d
parent98001593107de8d2fb01cfb88be0b1b334eb9b3e
efi: Pass correct file handle to efi_file_{read,close}

We're currently passing the file handle for the root file system to
efi_file_read() and efi_file_close(), instead of the file handle for the
file we wish to read/close.

While this has worked up until now, it seems that it has only been by
pure luck. Olivier explains,

 "The issue is the UEFI Fat driver might return the same function for
  'fh->read()' and 'h->read()'. While in our case it does not work with
  a different implementation of EFI_SIMPLE_FILE_SYSTEM_PROTOCOL. In our
  case, we return a different pointer when reading a directory and
  reading a file."

Fixing this actually clears up the two functions because we can drop one
of the arguments, and instead only pass a file 'handle' argument.

Reported-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
arch/x86/boot/compressed/eboot.c
drivers/firmware/efi/efi-stub-helper.c