shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

Merge pull request #11911 from keszybz/bootspec-handle-invalid-efi

Browse Source 
Bootspec handle invalid efi
This commit is contained in:
Lennart Poettering 2019-03-07 10:01:31 +01:00 committed by GitHub
commit b6996652e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/shared/bootspec.c
View File

@ -664,12 +664,18 @@ int boot_entries_load_config(
if (is_efi_boot()) {
r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderEntryOneShot", &config->entry_oneshot);
if (r < 0 && r != -ENOENT)
return log_error_errno(r, "Failed to read EFI var \"LoaderEntryOneShot\": %m");
if (r < 0 && !IN_SET(r, -ENOENT, -ENODATA)) {
log_warning_errno(r, "Failed to read EFI variable \"LoaderEntryOneShot\": %m");
if (r == -ENOMEM)
return r;
}
r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderEntryDefault", &config->entry_default);
if (r < 0 && r != -ENOENT)
return log_error_errno(r, "Failed to read EFI var \"LoaderEntryDefault\": %m");
if (r < 0 && !IN_SET(r, -ENOENT, -ENODATA)) {
log_warning_errno(r, "Failed to read EFI variable \"LoaderEntryDefault\": %m");
if (r == -ENOMEM)
return r;
}
}
config->default_entry = boot_entries_select_default(config);
@ -694,17 +700,12 @@ int boot_entries_load_config_auto(
* want to. */
if (!override_esp_path && !override_xbootldr_path) {
if (access("/run/boot-loader-entries/", F_OK) >= 0)
return boot_entries_load_config("/run/boot-loader-entries/", NULL, config);
if (access("/run/boot-loader-entries/", F_OK) < 0) {
if (errno != ENOENT)
return log_error_errno(errno, "Failed to determine whether /run/boot-loader-entries/ exists: %m");
} else {
r = boot_entries_load_config("/run/boot-loader-entries/", NULL, config);
if (r < 0)
return r;
return 0;
}
if (errno != ENOENT)
return log_error_errno(errno,
"Failed to determine whether /run/boot-loader-entries/ exists: %m");
}
r = find_esp_and_warn(override_esp_path, false, &esp_where, NULL, NULL, NULL, NULL);
@ -717,11 +718,7 @@ int boot_entries_load_config_auto(
if (r < 0 && r != -ENOKEY)
return r; /* It's fine if the XBOOTLDR partition doesn't exist, hence we ignore ENOKEY here */
r = boot_entries_load_config(esp_where, xbootldr_where, config);
if (r < 0)
return r;
return 0;
return boot_entries_load_config(esp_where, xbootldr_where, config);
}
int boot_entries_augment_from_loader(BootConfig *config, bool only_auto) {

2
src/shared/efivars.c
View File

@ -223,7 +223,7 @@ int efi_get_variable(
if (fstat(fd, &st) < 0)
return -errno;
if (st.st_size < 4)
return -EIO;
return -ENODATA;
if (st.st_size > 4*1024*1024 + 4)
return -E2BIG;