From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 16 Nov 2018 16:52:37 +0000 (+0100)
Subject: Merge pull request #10804 from poettering/sd-boot-updates
X-Git-Tag: v240~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b259a5bf34bf3c2e260badb0a75da1d753e0811;p=thirdparty%2Fsystemd.git

Merge pull request #10804 from poettering/sd-boot-updates

various sd-boot/EFI fixes (split out from #10495)
---

1b259a5bf34bf3c2e260badb0a75da1d753e0811
diff --cc src/boot/efi/util.c
index b70777292e0,320b12ef850..f1f1674c594
--- a/src/boot/efi/util.c
+++ b/src/boot/efi/util.c
@@@ -56,10 -56,13 +56,13 @@@ UINT64 time_usec(VOID) 
                          return 0;
          }
  
 -        return 1000 * 1000 * ticks / freq;
 +        return 1000UL * 1000UL * ticks / freq;
  }
  
- EFI_STATUS parse_boolean(CHAR8 *v, BOOLEAN *b) {
+ EFI_STATUS parse_boolean(const CHAR8 *v, BOOLEAN *b) {
+         if (!v)
+                 return EFI_INVALID_PARAMETER;
+ 
          if (strcmpa(v, (CHAR8 *)"1") == 0 ||
              strcmpa(v, (CHAR8 *)"yes") == 0 ||
              strcmpa(v, (CHAR8 *)"y") == 0 ||