lib/date: Make rtc_mktime and mktime64 Y2038-ready
Subsystems (2)
PATCH 1/1 lib/date: Make rtc_mktime and mktime64 Y2038-ready
From: Jan Kiszka <[email protected]>
We currently overflow due to wrong types used internally in rtc_mktime, on all platforms, and we return a too small type on 32-bit.
One consumer that directly benefits from this is mktime64. Many others may still store the result in a wrong type.
While at it, drop the redundant cast of mon in rtc_mktime (obsoleted by 714209832db1).
---
Noticed while playing with a x509 cert with 10000 days validity, resulting in a negative valid-to.
include/linux/time.h | 3 --- include/rtc.h | 8 +++++--- lib/date.c | 13 +++++-------- 3 files changed, 10 insertions(+), 14 deletions(-)
include/linux/time.h +0 -3
@@ -152,9 +152,6 @@ _DEFUN (ctime_r, (tim_p, result),return asctime_r (localtime_r (tim_p, &tm), result); } -/* for compatibility with linux code */ -typedef __s64 time64_t ; -#ifdef CONFIG_LIB_DATE time64_t mktime64(const unsigned int year, const unsigned int mon, const unsigned int day, const unsigned int hour,
include/rtc.h +5 -3
@@ -16,6 +16,8 @@#include <bcd.h> #include <rtc_def.h> +typedef int64_t time64_t ; +#ifdef CONFIG_DM_RTC struct udevice ;
@@ -301,7 +303,7 @@ int rtc_calc_weekday(struct rtc_time *time);void rtc_to_tm (u64 time_t,struct rtc_time *time);/** -* rtc_mktime() - Convert a broken-out time into a time_t value +* rtc_mktime() - Convert a broken-out time into a time64_t value * * The following fields need to be valid for this function to work: * tm_sec, tm_min, tm_hour, tm_mday, tm_mon, tm_year
@@ -309,9 +311,9 @@ void rtc_to_tm(u64 time_t, struct rtc_time *time);* Note that tm_wday and tm_yday are ignored. * * @time: Broken-out time to convert -* Return: corresponding time_t value, seconds since 1970-01-01 00:00:00 +* Return: corresponding time64_t value, seconds since 1970-01-01 00:00:00 */ -unsigned long rtc_mktime (const struct rtc_time *time); +time64_t rtc_mktime (const struct rtc_time *time);/** * rtc_month_days() - The number of days in the month
lib/date.c +5 -8
@@ -71,19 +71,16 @@ int rtc_calc_weekday(struct rtc_time *tm)* -year / 100 + year / 400 terms, and add 10.] * * This algorithm was first published by Gauss (I think). -* -* WARNING: this function will overflow on 2106-02-07 06:28:16 on -* machines where long is 32-bit! (However, as time_t is signed, we -* will already get problems at other places on 2038-01-19 03:14:08) */ -unsigned long rtc_mktime (const struct rtc_time *tm) +time64_t rtc_mktime (const struct rtc_time *tm) {int mon = tm->tm_mon;int year = tm->tm_year; -int days, hours; +unsigned long days; +time64_t hours; mon -=2 ; -if (0 >= (int )mon) {/* 1..12 -> 11, 12, 1..10 */ +if (0 >= mon) {/* 1..12 -> 11, 12, 1..10 */ mon +=12 ;/* Puts Feb last since it has leap day */ year -=1 ; }
@@ -109,5 +106,5 @@ time64_t mktime64(const unsigned int year, const unsigned int mon, time.tm_min = min; time.tm_sec = sec; -return (time64_t )rtc_mktime ((const struct rtc_time *)&time); +return rtc_mktime ((const struct rtc_time *)&time); }
--
2.34.1
Quoted 5 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
We currently overflow due to wrong types used internally in
rtc_mktime, on all platforms, and we return a too small type on 32-bit.
Quoted 7 lines
One consumer that directly benefits from this is mktime64. Many others may still store the result in a wrong type.
While at it, drop the redundant cast of mon in
rtc_mktime(obsoleted by714209832db1).Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 5 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
We currently overflow due to wrong types used internally in
rtc_mktime, on all platforms, and we return a too small type on 32-bit.
Quoted 7 lines
One consumer that directly benefits from this is mktime64. Many others may still store the result in a wrong type.
While at it, drop the redundant cast of mon in
rtc_mktime(obsoleted by714209832db1).Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom