From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Oct 2018 11:35:06 +0000 (+0200)
Subject: sd-boot: when converting menu timeout for UINTN to INTN saturate
X-Git-Tag: v240~305^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2366d923450e7722fdc743075d5f88550455e37a;p=thirdparty%2Fsystemd.git

sd-boot: when converting menu timeout for UINTN to INTN saturate

Let's be a bit more careful and handle overly long timeouts in a
slightly more sensible way.
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 79285bd6b94..3190849b7e4 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -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;