diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-24 17:28:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-24 17:28:18 -0400 |
| commit | 3c0cec035e5b06b638fb52ccd7383bbd5bcede35 (patch) | |
| tree | 5dfb658a5a4376ab257dfccdbc51f2e301fd0256 /include | |
| parent | 1aa3966173fe92fa3c46638ee8eb8b8491f521d6 (diff) | |
| parent | 2b3fbcb59f4174e455a6285eaddf1426ed3e76c5 (diff) | |
Merge tag 'efi-2020-10-rc3-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc3 (3)
The following bug fixes are contained in this pull-request:
* ResetSystem() should no hang if not implemented.
* Device paths in Bootxxxx variables should be verified.
* Use ':' as separator for command setenv -e -i instead of ','.
* Correct comments for functions.
* Update UEFI documentation.
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 2 | ||||
| -rw-r--r-- | include/efi_variable.h | 1 | ||||
| -rw-r--r-- | include/linux/kernel.h | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 50a17a33ca..0baa1d2324 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -631,6 +631,8 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr, const char *path, struct efi_device_path **device, struct efi_device_path **file); +ssize_t efi_dp_check_length(const struct efi_device_path *dp, + const size_t maxlen); #define EFI_DP_TYPE(_dp, _type, _subtype) \ (((_dp)->type == DEVICE_PATH_TYPE_##_type) && \ diff --git a/include/efi_variable.h b/include/efi_variable.h index 60491cb640..4704a3c16e 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -274,7 +274,6 @@ efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_na * @data: buffer to which the variable value is copied * @timep: authentication time (seconds since start of epoch) * Return: status code - */ efi_status_t __efi_runtime efi_get_variable_mem(u16 *variable_name, const efi_guid_t *vendor, u32 *attributes, diff --git a/include/linux/kernel.h b/include/linux/kernel.h index b88c210065..3e71d61074 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -19,6 +19,9 @@ #ifndef SIZE_MAX #define SIZE_MAX (~(size_t)0) #endif +#ifndef SSIZE_MAX +#define SSIZE_MAX ((ssize_t)(SIZE_MAX >> 1)) +#endif #define U8_MAX ((u8)~0U) #define S8_MAX ((s8)(U8_MAX>>1)) |