diff options
| author |   mmcc <mmcc@openbsd.org> | 2016-02-26 02:07:03 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2016-02-26 02:07:03 +0000 |
| commit | 2db0096641f23db4c3f988cc111260b3b92ccb81 (patch) | |
| tree | 005c5842c6da3074c38ef9bd93f065bcc233a361 | |
| parent | activate POOL_DEBUG during -current; miod (diff) | |
| download | wireguard-openbsd-2db0096641f23db4c3f988cc111260b3b92ccb81.tar.xz wireguard-openbsd-2db0096641f23db4c3f988cc111260b3b92ccb81.zip | |
Make alpha and sh 2038-safe. Now that we have 64-bit time_t, we don't
need to ignore the hardware clock when it reports a year > 2037. Irony
noted.
both ok millert, alpha ok deraadt
| -rw-r--r-- | sys/arch/alpha/alpha/clock.c | 7 | ||||
| -rw-r--r-- | sys/arch/sh/sh/clock.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c index e8c8db02f79..2f133035e97 100644 --- a/sys/arch/alpha/alpha/clock.c +++ b/sys/arch/alpha/alpha/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.21 2012/03/23 15:51:25 guenther Exp $ */ +/* $OpenBSD: clock.c,v 1.22 2016/02/26 02:07:03 mmcc Exp $ */ /* $NetBSD: clock.c,v 1.29 2000/06/05 21:47:10 thorpej Exp $ */ /* @@ -212,9 +212,8 @@ inittodr(time_t base) year = 1900 + UNIX_YEAR_OFFSET + ct.year; if (year < 1970) year += 100; - /* simple sanity checks (2037 = time_t overflow) */ - if (year < MINYEAR || year > 2037 || - ct.mon < 1 || ct.mon > 12 || ct.day < 1 || + /* simple sanity checks */ + if (year < MINYEAR || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* * Believe the time in the file system for lack of diff --git a/sys/arch/sh/sh/clock.c b/sys/arch/sh/sh/clock.c index 66cb3853d0b..9cc530404ba 100644 --- a/sys/arch/sh/sh/clock.c +++ b/sys/arch/sh/sh/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.7 2012/09/08 22:01:25 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.8 2016/02/26 02:07:03 mmcc Exp $ */ /* $NetBSD: clock.c,v 1.32 2006/09/05 11:09:36 uwe Exp $ */ /*- @@ -309,7 +309,7 @@ inittodr(time_t base) if (!(sh_clock.flags & SH_CLOCK_NOINITTODR) && (rtc < base || - dt.dt_year < MINYEAR || dt.dt_year > 2037 || + dt.dt_year < MINYEAR || dt.dt_mon < 1 || dt.dt_mon > 12 || dt.dt_wday > 6 || dt.dt_day < 1 || dt.dt_day > 31 || |