ntp: Limit TAI-UTC offset
Miroslav Lichvar
reviewerPATCH 1/1 ntp: Limit TAI-UTC offset
Don't allow the TAI-UTC offset of the system clock to be set by adjtimex() to a value larger than 100000 seconds.
This prevents an overflow in the conversion to int, prevents the CLOCK_TAI clock from getting too far ahead of the CLOCK_REALTIME clock, and it is still large enough to allow leap seconds to be inserted at the maximum rate currently supported by the kernel (once per day) for the next ~270 years, however unlikely it is that someone can survive a catastrophic event which slowed down the rotation of the Earth so much.
--- kernel/time/ntp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/ntp.c +3 -1
@@ -43,6 +43,7 @@ static u64 tick_length_base;#define MAX_TICKADJ 500LL/* usecs */ #define MAX_TICKADJ_SCALED \ (((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ) +#define MAX_TAI_OFFSET 100000/* * phase-lock loop variables
@@ -691,7 +692,8 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, time_constant =max (time_constant,0l ); } -if (txc->modes &ADJ_TAI && txc->constant >=0 ) +if (txc->modes &ADJ_TAI && + txc->constant >=0 && txc->constant <=MAX_TAI_OFFSET ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )
Signature · 1 line
2.17.2
tip-bot for Miroslav Lichvar
merge botntp: Limit TAI-UTC offset
Commit-ID: d897a4ab11dc8a9fda50d2eccc081a96a6385998 Gitweb: https://git.kernel.org/tip/d897a4ab11dc8a9fda50d2eccc081a96a6385998 Author: Miroslav Lichvar <[email protected]> AuthorDate: Tue, 18 Jun 2019 17:47:13 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 22 Jun 2019 11:28:53 +0200
ntp: Limit TAI-UTC offset
Don't allow the TAI-UTC offset of the system clock to be set by adjtimex() to a value larger than 100000 seconds.
This prevents an overflow in the conversion to int, prevents the CLOCK_TAI clock from getting too far ahead of the CLOCK_REALTIME clock, and it is still large enough to allow leap seconds to be inserted at the maximum rate currently supported by the kernel (once per day) for the next ~270 years, however unlikely it is that someone can survive a catastrophic event which slowed down the rotation of the Earth so much.
--- kernel/time/ntp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/ntp.c +3 -1
@@ -43,6 +43,7 @@ static u64 tick_length_base;#define MAX_TICKADJ 500LL/* usecs */ #define MAX_TICKADJ_SCALED \ (((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ) +#define MAX_TAI_OFFSET 100000/* * phase-lock loop variables
@@ -691,7 +692,8 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, time_constant =max (time_constant,0l ); } -if (txc->modes &ADJ_TAI && txc->constant >=0 ) +if (txc->modes &ADJ_TAI && + txc->constant >=0 && txc->constant <=MAX_TAI_OFFSET ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )