Merge pull request #15934 from keszybz/docs-and-test-fix

A few sundry documentation and code fixes
2020-05-27 15:16:24 +02:00
parent 6d02412d51 dde5c821bf
commit 49d5aae503
5 changed files with 11 additions and 28 deletions
@@ -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;