diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-05-27 15:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 15:16:24 +0200 |
| commit | 49d5aae503f86c61c9e8325c86494431fcf8ca98 (patch) | |
| tree | 93b72d73e2f75fcbd6f97416963986d841ff8127 /src/shared | |
| parent | Merge pull request #15928 from poettering/kill-mode-warnings (diff) | |
| parent | shared/efi-loader: remove check that uses absolute tick value (diff) | |
| download | systemd-49d5aae503f86c61c9e8325c86494431fcf8ca98.tar.xz systemd-49d5aae503f86c61c9e8325c86494431fcf8ca98.zip | |
Merge pull request #15934 from keszybz/docs-and-test-fix
A few sundry documentation and code fixes
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/efi-loader.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c index 34196537b7..c288176fd1 100644 --- a/src/shared/efi-loader.c +++ b/src/shared/efi-loader.c @@ -531,15 +531,11 @@ int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader) { if (r < 0) return log_debug_errno(r, "Failed to read LoaderTimeExecUSec: %m"); - if (y == 0 || y < x) + if (y == 0 || y < x || y - x > USEC_PER_HOUR) return log_debug_errno(SYNTHETIC_ERRNO(EIO), "Bad LoaderTimeInitUSec=%"PRIu64", LoaderTimeExecUSec=%" PRIu64"; refusing.", x, y); - if (y > USEC_PER_HOUR) - return log_debug_errno(SYNTHETIC_ERRNO(EIO), - "LoaderTimeExecUSec=%"PRIu64" too large, refusing.", x); - *firmware = x; *loader = y; |