ntp: Allow TAI-UTC offset to be set to zero
Miroslav Lichvar
reviewerPATCH 1/1 ntp: Allow TAI-UTC offset to be set to zero
The ADJ_TAI adjtimex mode sets the TAI-UTC offset of the system clock. It is typically set by NTP/PTP implementations and it is automatically updated by the kernel on leap seconds. The initial value is zero (which applications may interpret as unknown), but this value cannot be set by adjtimex. This limitation seems to go back to the original "nanokernel" implementation by David Mills.
Change the ADJ_TAI check to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.
--- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/ntp.c +1 -1
@@ -690,7 +690,7 @@ 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 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )
Signature · 1 line
2.17.2
Quoted 10 lines · Miroslav Lichvar
The
ADJ_TAIadjtimex mode sets the TAI-UTC offset of the system clock. It is typically set by NTP/PTP implementations and it is automatically updated by the kernel on leap seconds. The initial value is zero (which applications may interpret as unknown), but this value cannot be set by adjtimex. This limitation seems to go back to the original "nanokernel" implementation by David Mills.Change the
ADJ_TAIcheck to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.
Quoted 6 lines
Cc Thomas Gleixner <[email protected]>Cc John Stultz <[email protected]>Cc Richard Cochran <[email protected]>Cc Prarit Bhargava <[email protected]>Suggested-by Ondrej Mosnacek <[email protected]>Signed-off-by Miroslav Lichvar <[email protected]>
Thanks for sending the patch! Maybe you (or the committer) could consider adding:
so that it gets to the stable kernels as well.
Quoted 19 lines
--- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/time/ntp.c +1
-2@@ -690,7 +690,7 @@ 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 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET ) --2.17.2
Signature · 3 lines
Ondrej Mosnacek <omosnace at redhat dot com> Software Engineer, Security Technologies Red Hat, Inc.
Miroslav Lichvar
reviewerQuoted 8 lines · Ondrej Mosnacek
Quoted 2 lines · Miroslav Lichvar
Change the
ADJ_TAIcheck to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.Thanks for sending the patch! Maybe you (or the committer) could consider adding:
Fixes 153b5d054ac2 ("ntp: support for TAI")
To me the change looks more like an extension of the API, rather than a bug fix, so I'd leave that up to the committer.
Signature · 1 line
Miroslav Lichvar
Quoted 5 lines · Miroslav Lichvar
Quoted 3 lines · Ondrej Mosnacek
Quoted 2 lines · Miroslav Lichvar
Change the
ADJ_TAIcheck to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.
Quoted 7 lines
Quoted 4 lines
Thanks for sending the patch! Maybe you (or the committer) could consider adding:
Fixes 153b5d054ac2 ("ntp: support for TAI")To me the change looks more like an extension of the API, rather than a bug fix, so I'd leave that up to the committer.
I don't see why we need to backport that all the way, but I'm happy to add the tag if there is some really good reason.
Thanks,
tglx
Quoted 9 lines · Thomas Gleixner
Quoted 8 lines · Miroslav Lichvar
Quoted 7 lines · Ondrej Mosnacek
Quoted 2 lines · Miroslav Lichvar
Change the
ADJ_TAIcheck to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.Thanks for sending the patch! Maybe you (or the committer) could consider adding:
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Fixes 153b5d054ac2 ("ntp: support for TAI")To me the change looks more like an extension of the API, rather than a bug fix, so I'd leave that up to the committer.
I don't see why we need to backport that all the way, but I'm happy to add the tag if there is some really good reason.
OK, I can live without it, it's just that it kind of breaks the tests for the recent time auditing patches [1] (I try to reset to previous values when triggering events). I worked around it for now by resetting the value to 1 when original value was 0... I don't know if it can lead to some issues or not, but it would be nice if I could reset to the actual original value...
Signature · 3 lines
Ondrej Mosnacek <omosnace at redhat dot com> Software Engineer, Security Technologies Red Hat, Inc.
tip-bot for Miroslav Lichvar
merge botntp: Allow TAI-UTC offset to be set to zero
Commit-ID: fdc6bae940ee9eb869e493990540098b8c0fd6ab Gitweb: https://git.kernel.org/tip/fdc6bae940ee9eb869e493990540098b8c0fd6ab Author: Miroslav Lichvar <[email protected]> AuthorDate: Wed, 17 Apr 2019 10:48:33 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 9 May 2019 10:46:58 +0200
ntp: Allow TAI-UTC offset to be set to zero
The ADJ_TAI adjtimex mode sets the TAI-UTC offset of the system clock. It is typically set by NTP/PTP implementations and it is automatically updated by the kernel on leap seconds. The initial value is zero (which applications may interpret as unknown), but this value cannot be set by adjtimex. This limitation seems to go back to the original "nanokernel" implementation by David Mills.
Change the ADJ_TAI check to accept zero as a valid TAI-UTC offset in order to allow setting it back to the initial value.
--- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/ntp.c +1 -1
@@ -690,7 +690,7 @@ 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 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )