Commit fb85d072 authored by Peng Fan's avatar Peng Fan Committed by Heinrich Schuchardt

efi_loader: loosen buffer parameter check in efi_file_read_int

This is same issue as,
but that fix was wrongly partial reverted.

When reading a directory, EFI_BUFFER_TOO_SMALL should be returned when
the supplied buffer is too small, so a use-case is to call
EFI_FILE_PROTOCOL.Read() with *buffer_size=0 and buffer=NULL to
obtain the needed size before doing the actual read.

So remove the check only for directory reading, file reading already
do the check by itself.

Fixes: db12f518("efi_loader: implement non-blocking file services")
Signed-off-by: Peng Fan's avatarPeng Fan <>
Cc: Stefan Sørensen <>
Tested-by: default avatarPeter Robinson <>
Reviewed-by: Heinrich Schuchardt's avatarHeinrich Schuchardt <>
parent 5da2d3cd
Pipeline #7384 passed with stages
in 44 minutes and 6 seconds
......@@ -554,7 +554,7 @@ static efi_status_t efi_file_read_int(struct efi_file_handle *this,
efi_status_t ret = EFI_SUCCESS;
u64 bs;
if (!this || !buffer_size || !buffer)
if (!this || !buffer_size)
bs = *buffer_size;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment