Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-04 18:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: file size checks

Browse source 
The file size has to be determined in multiple places. Factor out a common
function.

If on entry into EFI_FILE_PROTOCOL.Read() the current position is beyond
the end of the file, return EFI_DEVICE_ERROR.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-09-07 23:28:04 +02:00
parent 83a74ad143
commit 9bb62fa63b
1 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lib/efi_loader/efi_file.c
View file

@ -318,11 +318,42 @@ static efi_status_t EFIAPI efi_file_delete(struct efi_file_handle *file)
return EFI_EXIT(ret); return EFI_EXIT(ret);
} }
/**
* efi_get_file_size() - determine the size of a file
*
* @fh: file handle
* @file_size: pointer to receive file size
* Return: status code
*/
static efi_status_t efi_get_file_size(struct file_handle *fh,
loff_t *file_size)
{
if (set_blk_dev(fh))
return EFI_DEVICE_ERROR;
if (fs_size(fh->path, file_size))
return EFI_DEVICE_ERROR;
return EFI_SUCCESS;
}
static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size, static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size,
void *buffer) void *buffer)
{ {
loff_t actread; loff_t actread;
efi_status_t ret;
loff_t file_size;
ret = efi_get_file_size(fh, &file_size);
if (ret != EFI_SUCCESS)
return ret;
if (file_size < fh->offset) {
ret = EFI_DEVICE_ERROR;
return ret;
}
if (set_blk_dev(fh))
return EFI_DEVICE_ERROR;
if (fs_read(fh->path, map_to_sysmem(buffer), fh->offset, if (fs_read(fh->path, map_to_sysmem(buffer), fh->offset,
*buffer_size, &actread)) *buffer_size, &actread))
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -341,6 +372,9 @@ static efi_status_t dir_read(struct file_handle *fh, u64 *buffer_size,
u64 required_size; u64 required_size;
u16 *dst; u16 *dst;
if (set_blk_dev(fh))
return EFI_DEVICE_ERROR;
if (!fh->dirs) { if (!fh->dirs) {
assert(fh->offset == 0); assert(fh->offset == 0);
fh->dirs = fs_opendir(fh->path); fh->dirs = fs_opendir(fh->path);
@ -409,11 +443,6 @@ static efi_status_t EFIAPI efi_file_read(struct efi_file_handle *file,
goto error; goto error;
} }
if (set_blk_dev(fh)) {
ret = EFI_DEVICE_ERROR;
goto error;
}
bs = *buffer_size; bs = *buffer_size;
if (fh->isdir) if (fh->isdir)
ret = dir_read(fh, &bs, buffer); ret = dir_read(fh, &bs, buffer);
@ -541,16 +570,9 @@ static efi_status_t EFIAPI efi_file_setpos(struct efi_file_handle *file,
if (pos == ~0ULL) { if (pos == ~0ULL) {
loff_t file_size; loff_t file_size;
if (set_blk_dev(fh)) { ret = efi_get_file_size(fh, &file_size);
ret = EFI_DEVICE_ERROR; if (ret != EFI_SUCCESS)
goto error; goto error;
}
if (fs_size(fh->path, &file_size)) {
ret = EFI_DEVICE_ERROR;
goto error;
}
pos = file_size; pos = file_size;
} }
@ -586,15 +608,9 @@ static efi_status_t EFIAPI efi_file_getinfo(struct efi_file_handle *file,
goto error; goto error;
} }
if (set_blk_dev(fh)) { ret = efi_get_file_size(fh, &file_size);
ret = EFI_DEVICE_ERROR; if (ret != EFI_SUCCESS)
goto error; goto error;
}
if (fs_size(fh->path, &file_size)) {
ret = EFI_DEVICE_ERROR;
goto error;
}
memset(info, 0, required_size); memset(info, 0, required_size);
@ -693,14 +709,9 @@ static efi_status_t EFIAPI efi_file_setinfo(struct efi_file_handle *file,
} }
free(new_file_name); free(new_file_name);
/* Check for truncation */ /* Check for truncation */
if (set_blk_dev(fh)) { ret = efi_get_file_size(fh, &file_size);
ret = EFI_DEVICE_ERROR; if (ret != EFI_SUCCESS)
goto out; goto out;
}
if (fs_size(fh->path, &file_size)) {
ret = EFI_DEVICE_ERROR;
goto out;
}
if (file_size != info->file_size) { if (file_size != info->file_size) {
/* TODO: we do not support truncation */ /* TODO: we do not support truncation */
EFI_PRINT("Truncation not supported\n"); EFI_PRINT("Truncation not supported\n");