diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-04-22 07:42:18 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-04-22 07:42:18 +0000 |
| commit | 1d5ba041baa7f0924446ec8615ed568eb895fb45 (patch) | |
| tree | 0aa3d9f173c5d945e40775eaa02624a7555fcf3d /usr.sbin/ntpd | |
| parent | 751db947d0ffdea38adb7931a5a93702b258abfa (diff) | |
ignore replies with timestamps after 2030 to prevent time_t / tv_sec wraps
input & ok theo
Diffstat (limited to 'usr.sbin/ntpd')
| -rw-r--r-- | usr.sbin/ntpd/client.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntp.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/usr.sbin/ntpd/client.c b/usr.sbin/ntpd/client.c index 19c15e00d16..0d29878dbbf 100644 --- a/usr.sbin/ntpd/client.c +++ b/usr.sbin/ntpd/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.84 2009/03/04 19:17:36 stevesk Exp $ */ +/* $OpenBSD: client.c,v 1.85 2009/04/22 07:42:17 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -256,6 +256,16 @@ client_dispatch(struct ntp_peer *p, u_int8_t settime) T2 = lfp_to_d(msg.rectime); T3 = lfp_to_d(msg.xmttime); + /* + * XXX workaround: time_t / tv_sec must never wrap. + * around 2020 we will need a solution (64bit time_t / tv_sec). + * consider every answer with a timestamp beyond january 2030 bogus. + */ + if (T2 > JAN_2030 || T3 > JAN_2030) { + set_next(p, error_interval()); + return (0); + } + p->reply[p->shift].offset = ((T2 - T1) + (T3 - T4)) / 2; p->reply[p->shift].delay = (T4 - T1) - (T3 - T2); if (p->reply[p->shift].delay < 0) { diff --git a/usr.sbin/ntpd/ntp.h b/usr.sbin/ntpd/ntp.h index 3781fb42a59..fdf3529434d 100644 --- a/usr.sbin/ntpd/ntp.h +++ b/usr.sbin/ntpd/ntp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.h,v 1.12 2007/05/26 21:20:35 henning Exp $ */ +/* $OpenBSD: ntp.h,v 1.13 2009/04/22 07:42:17 henning Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -141,6 +141,7 @@ struct ntp_query { #define MODE_RES2 7 /* reserved for private use */ #define JAN_1970 2208988800UL /* 1970 - 1900 in seconds */ +#define JAN_2030 1893456000UL + JAN_1970 /* 1. 1. 2030 00:00:00 */ #define NTP_VERSION 4 #define NTP_MAXSTRATUM 15 |