time: fix a assignment error in ntp module
PATCH 1/1 time: fix a assignment error in ntp module
From: swkhack <[email protected]>
It is meanless to check a 64bit(txc->constant) value is postive when the value has to be assigned to a 32 bit variable(*time_tai). So I make a temp type conversion before the compare.
--- 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 && (int )txc->constant >0 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )
Signature · 1 line
2.17.1
Quoted 5 lines · Weikang shi
From: swkhack <[email protected]>
It is meanless to check a 64bit(txc->constant) value is postive when the value has to be assigned to a 32 bit
variable(*time_tai). So I make a temp type conversion before the compare.
Errm no. This is missing a proper range check in the first place.
Quoted 22 lines
Signed-off-by swkhack <[email protected]>--- 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 && (int )txc->constant >0 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )Signature · 1 line
2.17.1
Quoted 5 lines · Weikang shi
From: swkhack <[email protected]>
It is meanless to check a 64bit(txc->constant) value is postive when the value has to be assigned to a 32 bit
variable(*time_tai). So I make a temp type conversion before the compare.
What? Casting it to int makes it more negative, right?
That's just wrong:
long long x = 0xFFFFFFFF00000000;
int y = (int) x;x is obviously negative, but y not. C type casting 101.
Quoted 10 lines
Signed-off-by swkhack <[email protected]>--- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/time/ntp.c +0
-0
kernel/time/ntp.c static inline void process_adjtimex_modes(const struct __kernel_timex *txc, · line 694
Quoted 6 lines
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 && (int )txc->constant >0 ) *time_tai = txc->constant;
The way more interesting question is whether txc->constant can be > UINT_MAX. In that case the txc->constant would be truncated.
Miroslav?
Thanks,
tglx
A message that is not in the archive (sent off-list or not yet received): CAObeVcdBDbSiyQCX7C_G3p6TpB9yjRyrWwsvPgh11V8v+BNaqQ@mail.gmail.com
On Mon, 17 Jun 2019, 维康石 wrote:
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
A: No.
Q: Should I include quotations after my reply?
http://daringfireball.net/2007/07/on_top
Quoted 3 lines
Yes,the >UINT_MAX value can be passed by
syscalladjtimex->do_adjtimex->__do_adjtimex->process_adjtimex_modesby the proper arugments.
So there is clearly some sanity check missing, but surely not that type cast.
Quoted 8 lines
Quoted 8 lines
kernel/time/ntp.c static inline void process_adjtimex_modes(const struct __kernel_timex *txc, · line 694
Quoted 3 lines
kernel/time/ntp.c +1
-1-if (txc->modes &ADJ_TAI && txc->constant >0 ) +if (txc->modes &ADJ_TAI && (int )txc->constant >0 ) *time_tai = txc->constant;The way more interesting question is whether
txc->constantcan be >UINT_MAX. In that case thetxc->constantwould be truncated.Miroslav?
Thanks,
tglx
Miroslav Lichvar
reviewerQuoted 7 lines · Thomas Gleixner
Quoted 3 lines · 维康石
Yes,the >UINT_MAX value can be passed by
syscalladjtimex->do_adjtimex->__do_adjtimex->process_adjtimex_modesby the proper arugments.So there is clearly some sanity check missing, but surely not that type cast.
As the offset is saved in an int (and returned via adjtimex() in the tai field), should be the maximum INT_MAX?
We probably also want to avoid overflow in the offset on a leap second and the CLOCK_TAI clock itself, so maybe it would make sense to specify a much smaller maximum like 1000000?
Even 1000 should be good enough for near future. Negative values are not allowed anyway. If the Earth's rotation changed significantly (e.g. hitting a very large asteroid), there probably wouldn't be anyone left to care about TAI.
Signature · 1 line
Miroslav Lichvar
Miroslav,
Quoted 11 lines · Miroslav Lichvar
Quoted 7 lines · Thomas Gleixner
Quoted 3 lines · 维康石
Yes,the >UINT_MAX value can be passed by
syscalladjtimex->do_adjtimex->__do_adjtimex->process_adjtimex_modesby the proper arugments.So there is clearly some sanity check missing, but surely not that type cast.
As the offset is saved in an int (and returned via
adjtimex()in the tai field), should be the maximumINT_MAX?
Right.
Quoted 8 lines
We probably also want to avoid overflow in the offset on a leap second and the
CLOCK_TAIclock itself, so maybe it would make sense to specify a much smaller maximum like 1000000?Even 1000 should be good enough for near future. Negative values are not allowed anyway. If the Earth's rotation changed significantly (e.g. hitting a very large asteroid), there probably wouldn't be anyone left to care about TAI.
Hehehe. I leave it to you to find a sane limit taking all the possible events into account :)
Thanks,
tglx