efi_loader: handling of daylight saving time
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Fri, 31 May 2019 20:08:45 +0000 (22:08 +0200)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Fri, 31 May 2019 21:27:20 +0000 (23:27 +0200)
If SetTime() is meant to set daylight saving time it will be called with
Time.Daylight == EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT.

Return 0 from GetTime() if time is not in daylight because we cannot
determine if we are in a time zone with daylight saving time.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
lib/efi_loader/efi_runtime.c

index 2082d1304fea7fb718d741ed8b7e2d40f691df2f..98ab4de03daf131c60fd3624e0fab36fda4e138f 100644 (file)
@@ -195,9 +195,9 @@ static efi_status_t EFIAPI efi_get_time_boottime(
        time->hour = tm.tm_hour;
        time->minute = tm.tm_min;
        time->second = tm.tm_sec;
-       time->daylight = EFI_TIME_ADJUST_DAYLIGHT;
-       if (tm.tm_isdst > 0)
-               time->daylight |= EFI_TIME_IN_DAYLIGHT;
+       if (tm.tm_isdst)
+               time->daylight =
+                       EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT;
        time->timezone = EFI_UNSPECIFIED_TIMEZONE;
 
        if (capabilities) {
@@ -276,7 +276,8 @@ static efi_status_t EFIAPI efi_set_time_boottime(struct efi_time *time)
        tm.tm_hour = time->hour;
        tm.tm_min = time->minute;
        tm.tm_sec = time->second;
-       tm.tm_isdst = time->daylight == EFI_TIME_IN_DAYLIGHT;
+       tm.tm_isdst = time->daylight ==
+                     (EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT);
        /* Calculate day of week */
        rtc_calc_weekday(&tm);