X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fefivars.c;h=f18f5c4b16aa4b81057c5e2cbb96f0968f26e1a8;hp=064746a9a89ca558e56f620664cac4bda808128e;hb=f41925b4e442a34c93ad120ef1426c974a047ed1;hpb=61cc634bc208b264bd2fbe6af241b345a2002509 diff --git a/src/shared/efivars.c b/src/shared/efivars.c index 064746a9a..f18f5c4b1 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -24,14 +24,43 @@ #include #include +#include "acpi-fpdt.h" #include "util.h" #include "utf8.h" #include "efivars.h" +#ifdef ENABLE_EFI + bool is_efi_boot(void) { return access("/sys/firmware/efi", F_OK) >= 0; } +static int read_flag(const char *varname) { + int r; + _cleanup_free_ void *v = NULL; + size_t s; + uint8_t b; + + r = efi_get_variable(EFI_VENDOR_GLOBAL, varname, NULL, &v, &s); + if (r < 0) + return r; + + if (s != 1) + return -EINVAL; + + b = *(uint8_t *)v; + r = b > 0; + return r; +} + +int is_efi_secure_boot(void) { + return read_flag("SecureBoot"); +} + +int is_efi_secure_boot_setup_mode(void) { + return read_flag("SetupMode"); +} + int efi_get_variable( sd_id128_t vendor, const char *name, @@ -79,7 +108,7 @@ int efi_get_variable( n = read(fd, r, (size_t) st.st_size - 4); if (n < 0) { free(r); - return (int) -n; + return -errno; } if (n != (ssize_t) st.st_size - 4) { free(r); @@ -101,7 +130,7 @@ int efi_get_variable( int efi_get_variable_string(sd_id128_t vendor, const char *name, char **p) { _cleanup_free_ void *s = NULL; - size_t ss; + size_t ss = 0; int r; char *x; @@ -199,10 +228,12 @@ int efi_get_boot_option( if (title_size > l - offsetof(struct boot_option, title)) return -EINVAL; - s = utf16_to_utf8(header->title, title_size); - if (!s) { - err = -ENOMEM; - goto err; + if (title) { + s = utf16_to_utf8(header->title, title_size); + if (!s) { + err = -ENOMEM; + goto err; + } } if (header->path_len > 0) { @@ -238,12 +269,13 @@ int efi_get_boot_option( if (dpath->drive.signature_type != 0x02) continue; - efi_guid_to_id128(dpath->drive.signature, &p_uuid); + if (part_uuid) + efi_guid_to_id128(dpath->drive.signature, &p_uuid); continue; } /* Sub-Type 4 – File Path */ - if (dpath->sub_type == 0x04) { + if (dpath->sub_type == 0x04 && !p && path) { p = utf16_to_utf8(dpath->path, dpath->length-4); continue; } @@ -303,11 +335,17 @@ static int boot_id_hex(const char s[4]) { return id; } +static int cmp_uint16(const void *_a, const void *_b) { + const uint16_t *a = _a, *b = _b; + + return (int)*a - (int)*b; +} + int efi_get_boot_options(uint16_t **options) { _cleanup_closedir_ DIR *dir = NULL; struct dirent *de; uint16_t *list = NULL; - int count = 0; + int count = 0, r; assert(options); @@ -315,7 +353,7 @@ int efi_get_boot_options(uint16_t **options) { if (!dir) return -errno; - while ((de = readdir(dir))) { + FOREACH_DIRENT(de, dir, r = -errno; goto fail) { int id; uint16_t *t; @@ -334,23 +372,28 @@ int efi_get_boot_options(uint16_t **options) { t = realloc(list, (count + 1) * sizeof(uint16_t)); if (!t) { - free(list); - return -ENOMEM; + r = -ENOMEM; + goto fail; } list = t; list[count ++] = id; - } + qsort_safe(list, count, sizeof(uint16_t), cmp_uint16); + *options = list; return count; + +fail: + free(list); + return r; } static int read_usec(sd_id128_t vendor, const char *name, usec_t *u) { _cleanup_free_ char *j = NULL; int r; - uint64_t x; + uint64_t x = 0; assert(name); assert(u); @@ -367,7 +410,7 @@ static int read_usec(sd_id128_t vendor, const char *name, usec_t *u) { return 0; } -static int get_boot_usec(usec_t *firmware, usec_t *loader) { +int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader) { uint64_t x, y; int r; @@ -394,48 +437,9 @@ static int get_boot_usec(usec_t *firmware, usec_t *loader) { return 0; } -int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) { - usec_t x, y, a; - int r; - dual_timestamp _n; - - assert(firmware); - assert(loader); - - if (!n) { - dual_timestamp_get(&_n); - n = &_n; - } - - r = get_boot_usec(&x, &y); - if (r < 0) - return r; - - /* Let's convert this to timestamps where the firmware - * began/loader began working. To make this more confusing: - * since usec_t is unsigned and the kernel's monotonic clock - * begins at kernel initialization we'll actually initialize - * the monotonic timestamps here as negative of the actual - * value. */ - - firmware->monotonic = y; - loader->monotonic = y - x; - - a = n->monotonic + firmware->monotonic; - firmware->realtime = n->realtime > a ? n->realtime - a : 0; - - a = n->monotonic + loader->monotonic; - loader->realtime = n->realtime > a ? n->realtime - a : 0; - - return 0; -} - -int efi_get_loader_device_part_uuid(sd_id128_t *u) { +int efi_loader_get_device_part_uuid(sd_id128_t *u) { _cleanup_free_ char *p = NULL; int r, parsed[16]; - unsigned i; - - assert(u); r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderDevicePartUUID", &p); if (r < 0) @@ -448,8 +452,14 @@ int efi_get_loader_device_part_uuid(sd_id128_t *u) { &parsed[12], &parsed[13], &parsed[14], &parsed[15]) != 16) return -EIO; - for (i = 0; i < ELEMENTSOF(parsed); i++) - u->bytes[i] = parsed[i]; + if (u) { + unsigned i; + + for (i = 0; i < ELEMENTSOF(parsed); i++) + u->bytes[i] = parsed[i]; + } return 0; } + +#endif