diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2018-09-13 21:31:49 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-09-23 21:55:30 +0200 |
| commit | bd66588657e827904b09034957e9d5a1f9d75bac (patch) | |
| tree | 70782260e725077ed2f5ba64f3c31c009d0ac262 /lib/efi_loader/efi_file.c | |
| parent | 1c381cebb7a67ad2b55e8271bbe344baf060cb85 (diff) | |
| download | u-boot-bd66588657e827904b09034957e9d5a1f9d75bac.tar.gz u-boot-bd66588657e827904b09034957e9d5a1f9d75bac.tar.xz u-boot-bd66588657e827904b09034957e9d5a1f9d75bac.zip | |
efi_loader: loosen check of parameters of efi_file_open()
The UEFI spec requires that attributes are only set for when
EFI_FILE_MODE_CREATE is set in open_mode.
The SCT tries to read a directory with EFI_FILE_DIRECTORY.
As EDK2 allows this we should not be more strict.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib/efi_loader/efi_file.c')
| -rw-r--r-- | lib/efi_loader/efi_file.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 9ba7673fb6..84be0d5818 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -229,7 +229,16 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file, ret = EFI_INVALID_PARAMETER; goto out; } - if ((!(open_mode & EFI_FILE_MODE_CREATE) && attributes) || + /* + * The UEFI spec requires that attributes are only set in create mode. + * The SCT does not care about this and sets EFI_FILE_DIRECTORY in + * read mode. EDK2 does not check that attributes are zero if not in + * create mode. + * + * So here we only check attributes in create mode and do not check + * that they are zero otherwise. + */ + if ((open_mode & EFI_FILE_MODE_CREATE) && (attributes & (EFI_FILE_READ_ONLY | ~EFI_FILE_VALID_ATTR))) { ret = EFI_INVALID_PARAMETER; goto out; |