]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-boot: when converting menu timeout for UINTN to INTN saturate
authorLennart Poettering <lennart@poettering.net>
Mon, 22 Oct 2018 11:35:06 +0000 (13:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 16 Nov 2018 14:47:18 +0000 (15:47 +0100)
Let's be a bit more careful and handle overly long timeouts in a
slightly more sensible way.

src/boot/efi/boot.c

index 79285bd6b9441e89ec4889f4ffbf67aa087606b5..3190849b7e43326ceca3bd7e965cc280d9d8e67c 100644 (file)
@@ -1413,7 +1413,7 @@ static VOID config_load_defaults(Config *config, EFI_FILE *root_dir) {
 
         err = efivar_get_int(L"LoaderConfigTimeout", &sec);
         if (!EFI_ERROR(err)) {
-                config->timeout_sec_efivar = sec;
+                config->timeout_sec_efivar = sec > INTN_MAX ? INTN_MAX : sec;
                 config->timeout_sec = sec;
         } else
                 config->timeout_sec_efivar = -1;