Y2038

y2038@lists.linaro.org

1021 discussions

[PATCH 1/7] timekeeping: consolidate timekeeping_inject_offset code

by Arnd Bergmann

The code to check the adjtimex() or clock_adjtime() arguments is spread out across multiple files for presumably only historic reasons. As a preparatation for a rework to get rid of the use of 'struct timeval' and 'struct timespec' in there, this moves all the portions into kernel/time/timekeeping.c and marks them as 'static'. The warp_clock() function here is not as closely related as the others, but I feel it still makes sense to move it here in order to consolidate all callers of timekeeping_inject_offset(). Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- include/linux/time.h | 26 ---------- kernel/time/ntp.c | 61 ---------------------- kernel/time/ntp_internal.h | 1 - kernel/time/time.c | 36 +------------ kernel/time/timekeeping.c | 123 ++++++++++++++++++++++++++++++++++++++++++++- kernel/time/timekeeping.h | 2 +- 6 files changed, 123 insertions(+), 126 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index 9bc1f945777c..c0fbad08448f 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -134,32 +134,6 @@ static inline bool timeval_valid(const struct timeval *tv) extern struct timespec timespec_trunc(struct timespec t, unsigned gran); -/* - * Validates if a timespec/timeval used to inject a time offset is valid. - * Offsets can be postive or negative. The value of the timeval/timespec - * is the sum of its fields, but *NOTE*: the field tv_usec/tv_nsec must - * always be non-negative. - */ -static inline bool timeval_inject_offset_valid(const struct timeval *tv) -{ - /* We don't check the tv_sec as it can be positive or negative */ - - /* Can't have more microseconds then a second */ - if (tv->tv_usec < 0 || tv->tv_usec >= USEC_PER_SEC) - return false; - return true; -} - -static inline bool timespec_inject_offset_valid(const struct timespec *ts) -{ - /* We don't check the tv_sec as it can be positive or negative */ - - /* Can't have more nanoseconds then a second */ - if (ts->tv_nsec < 0 || ts->tv_nsec >= NSEC_PER_SEC) - return false; - return true; -} - /* Some architectures do not supply their own clocksource. * This is mainly the case in architectures that get their * inter-tick times by reading the counter on their interval diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index edf19cc53140..a5e702669d84 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -653,67 +653,6 @@ static inline void process_adjtimex_modes(struct timex *txc, } - -/** - * ntp_validate_timex - Ensures the timex is ok for use in do_adjtimex - */ -int ntp_validate_timex(struct timex *txc) -{ - if (txc->modes & ADJ_ADJTIME) { - /* singleshot must not be used with any other mode bits */ - if (!(txc->modes & ADJ_OFFSET_SINGLESHOT)) - return -EINVAL; - if (!(txc->modes & ADJ_OFFSET_READONLY) && - !capable(CAP_SYS_TIME)) - return -EPERM; - } else { - /* In order to modify anything, you gotta be super-user! */ - if (txc->modes && !capable(CAP_SYS_TIME)) - return -EPERM; - /* - * if the quartz is off by more than 10% then - * something is VERY wrong! - */ - if (txc->modes & ADJ_TICK && - (txc->tick < 900000/USER_HZ || - txc->tick > 1100000/USER_HZ)) - return -EINVAL; - } - - if (txc->modes & ADJ_SETOFFSET) { - /* In order to inject time, you gotta be super-user! */ - if (!capable(CAP_SYS_TIME)) - return -EPERM; - - if (txc->modes & ADJ_NANO) { - struct timespec ts; - - ts.tv_sec = txc->time.tv_sec; - ts.tv_nsec = txc->time.tv_usec; - if (!timespec_inject_offset_valid(&ts)) - return -EINVAL; - - } else { - if (!timeval_inject_offset_valid(&txc->time)) - return -EINVAL; - } - } - - /* - * Check for potential multiplication overflows that can - * only happen on 64-bit systems: - */ - if ((txc->modes & ADJ_FREQUENCY) && (BITS_PER_LONG == 64)) { - if (LLONG_MIN / PPM_SCALE > txc->freq) - return -EINVAL; - if (LLONG_MAX / PPM_SCALE < txc->freq) - return -EINVAL; - } - - return 0; -} - - /* * adjtimex mainly allows reading (and writing, if superuser) of * kernel time-keeping variables. used by xntpd. diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h index d8a7c11fa71a..74b52cd48209 100644 --- a/kernel/time/ntp_internal.h +++ b/kernel/time/ntp_internal.h @@ -7,7 +7,6 @@ extern void ntp_clear(void); extern u64 ntp_tick_length(void); extern ktime_t ntp_get_next_leap(void); extern int second_overflow(time64_t secs); -extern int ntp_validate_timex(struct timex *); extern int __do_adjtimex(struct timex *, struct timespec64 *, s32 *); extern void __hardpps(const struct timespec64 *, const struct timespec64 *); #endif /* _LINUX_NTP_INTERNAL_H */ diff --git a/kernel/time/time.c b/kernel/time/time.c index 44a8c1402133..04684e294f00 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -158,40 +158,6 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, } /* - * Indicates if there is an offset between the system clock and the hardware - * clock/persistent clock/rtc. - */ -int persistent_clock_is_local; - -/* - * Adjust the time obtained from the CMOS to be UTC time instead of - * local time. - * - * This is ugly, but preferable to the alternatives. Otherwise we - * would either need to write a program to do it in /etc/rc (and risk - * confusion if the program gets run more than once; it would also be - * hard to make the program warp the clock precisely n hours) or - * compile in the timezone information into the kernel. Bad, bad.... - * - * - TYT, 1992-01-01 - * - * The best thing to do is to keep the CMOS clock in universal time (UTC) - * as real UNIX machines always do it. This avoids all headaches about - * daylight saving times and warping kernel clocks. - */ -static inline void warp_clock(void) -{ - if (sys_tz.tz_minuteswest != 0) { - struct timespec adjust; - - persistent_clock_is_local = 1; - adjust.tv_sec = sys_tz.tz_minuteswest * 60; - adjust.tv_nsec = 0; - timekeeping_inject_offset(&adjust); - } -} - -/* * In case for some reason the CMOS clock has not already been running * in UTC, but in some local time: The first time we set the timezone, * we will warp the clock so that it is ticking UTC time instead of @@ -224,7 +190,7 @@ int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz if (firsttime) { firsttime = 0; if (!tv) - warp_clock(); + timekeeping_warp_clock(); } } if (tv) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 8af77006e937..679dbfbea419 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1300,13 +1300,39 @@ int do_settimeofday64(const struct timespec64 *ts) } EXPORT_SYMBOL(do_settimeofday64); +/* + * Validates if a timespec/timeval used to inject a time offset is valid. + * Offsets can be postive or negative. The value of the timeval/timespec + * is the sum of its fields, but *NOTE*: the field tv_usec/tv_nsec must + * always be non-negative. + */ +static inline bool timeval_inject_offset_valid(const struct timeval *tv) +{ + /* We don't check the tv_sec as it can be positive or negative */ + + /* Can't have more microseconds then a second */ + if (tv->tv_usec < 0 || tv->tv_usec >= USEC_PER_SEC) + return false; + return true; +} + +static inline bool timespec_inject_offset_valid(const struct timespec *ts) +{ + /* We don't check the tv_sec as it can be positive or negative */ + + /* Can't have more nanoseconds then a second */ + if (ts->tv_nsec < 0 || ts->tv_nsec >= NSEC_PER_SEC) + return false; + return true; +} + /** * timekeeping_inject_offset - Adds or subtracts from the current time. * @tv: pointer to the timespec variable containing the offset * * Adds or subtracts an offset value from the current time. */ -int timekeeping_inject_offset(struct timespec *ts) +static int timekeeping_inject_offset(struct timespec *ts) { struct timekeeper *tk = &tk_core.timekeeper; unsigned long flags; @@ -1345,7 +1371,40 @@ int timekeeping_inject_offset(struct timespec *ts) return ret; } -EXPORT_SYMBOL(timekeeping_inject_offset); + +/* + * Indicates if there is an offset between the system clock and the hardware + * clock/persistent clock/rtc. + */ +int persistent_clock_is_local; + +/* + * Adjust the time obtained from the CMOS to be UTC time instead of + * local time. + * + * This is ugly, but preferable to the alternatives. Otherwise we + * would either need to write a program to do it in /etc/rc (and risk + * confusion if the program gets run more than once; it would also be + * hard to make the program warp the clock precisely n hours) or + * compile in the timezone information into the kernel. Bad, bad.... + * + * - TYT, 1992-01-01 + * + * The best thing to do is to keep the CMOS clock in universal time (UTC) + * as real UNIX machines always do it. This avoids all headaches about + * daylight saving times and warping kernel clocks. + */ +void timekeeping_warp_clock(void) +{ + if (sys_tz.tz_minuteswest != 0) { + struct timespec adjust; + + persistent_clock_is_local = 1; + adjust.tv_sec = sys_tz.tz_minuteswest * 60; + adjust.tv_nsec = 0; + timekeeping_inject_offset(&adjust); + } +} /** * __timekeeping_set_tai_offset - Sets the TAI offset from UTC and monotonic @@ -2290,6 +2349,66 @@ ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, ktime_t *offs_real, } /** + * ntp_validate_timex - Ensures the timex is ok for use in do_adjtimex + */ +static int ntp_validate_timex(struct timex *txc) +{ + if (txc->modes & ADJ_ADJTIME) { + /* singleshot must not be used with any other mode bits */ + if (!(txc->modes & ADJ_OFFSET_SINGLESHOT)) + return -EINVAL; + if (!(txc->modes & ADJ_OFFSET_READONLY) && + !capable(CAP_SYS_TIME)) + return -EPERM; + } else { + /* In order to modify anything, you gotta be super-user! */ + if (txc->modes && !capable(CAP_SYS_TIME)) + return -EPERM; + /* + * if the quartz is off by more than 10% then + * something is VERY wrong! + */ + if (txc->modes & ADJ_TICK && + (txc->tick < 900000/USER_HZ || + txc->tick > 1100000/USER_HZ)) + return -EINVAL; + } + + if (txc->modes & ADJ_SETOFFSET) { + /* In order to inject time, you gotta be super-user! */ + if (!capable(CAP_SYS_TIME)) + return -EPERM; + + if (txc->modes & ADJ_NANO) { + struct timespec ts; + + ts.tv_sec = txc->time.tv_sec; + ts.tv_nsec = txc->time.tv_usec; + if (!timespec_inject_offset_valid(&ts)) + return -EINVAL; + + } else { + if (!timeval_inject_offset_valid(&txc->time)) + return -EINVAL; + } + } + + /* + * Check for potential multiplication overflows that can + * only happen on 64-bit systems: + */ + if ((txc->modes & ADJ_FREQUENCY) && (BITS_PER_LONG == 64)) { + if (LLONG_MIN / PPM_SCALE > txc->freq) + return -EINVAL; + if (LLONG_MAX / PPM_SCALE < txc->freq) + return -EINVAL; + } + + return 0; +} + + +/** * do_adjtimex() - Accessor function to NTP __do_adjtimex function */ int do_adjtimex(struct timex *txc) diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h index d0914676d4c5..44aec7893cdd 100644 --- a/kernel/time/timekeeping.h +++ b/kernel/time/timekeeping.h @@ -10,7 +10,7 @@ extern ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, extern int timekeeping_valid_for_hres(void); extern u64 timekeeping_max_deferment(void); -extern int timekeeping_inject_offset(struct timespec *ts); +extern void timekeeping_warp_clock(void); extern int timekeeping_suspend(void); extern void timekeeping_resume(void); -- 2.9.0

2 months, 2 weeks

Your message to y2038@lists.linaro.org awaits moderator approval

by y2038-bounces＠lists.linaro.org

Your mail to 'y2038(a)lists.linaro.org' with the subject Is being held until the list moderator can review it for approval. The message is being held because: Message has no subject Either the message will get posted to the list, or you will receive notification of the moderator's decision.

2 years, 1 month

DIVIDA PENDIENTE - EMISION DE FACTURA ELECTRONICA

by NOTIFICATION 148533

Su factura sigue pendiente Por favor, compruebe y póngase en contacto conmigo lo antes posible. Confirme que sus datos son correctos. DESCARGAR FACTURA COMPLETA (PDF/XML) Folio: 498566192741750342Fecha: 30/11/2023 03:53:35 pm Este es el segundo cargo no pago. Te deseo una semana maravillosa. FIEL Cobranzas segura e inteligente - CFDI: 66192741750342 n_42239869717099997889816848379

2 years, 9 months

Informe policial emitido ID: (615124)

by POLICIA NACIONAL 525584

ADVERTENCIA DE CITACIÓN BUENOS DIAS SR(A), De conformidad con el art. 455, § 1 del Código de Procedimiento Civil se hace presente al ÍNTIMO Su Señoría comparezca, como testigo, en la audiencia que se celebrará miércoles, 12/09/2023. Documento adjunto referente al trámite CITACIÓN ADJUNTA Nº 50824559789200 [1] Titular: Lic. Dr. Delio Dante López Medrano Fiscalia General de la Republica Copyright (c) 2023, Todos los derechos reservados. Links: ------ DESCARGAR CITACIÓN (PDF/XML) n_819469268987711699994854682624418988056201260438790112

3 years

美国亚马逊专线-美森快船-承诺时效，赔偿1元/kg/工作日

by 美国亚马逊专线-美森快船-� �诺时效，赔偿 1元/kg/工作日

  专注亚马逊FBA运输美国亚马逊专线-美森快船提供独家开发的路线给亚马逊卖家，有经济型，快捷型服务供客户选择。整箱，拼箱都是我们的强项，并根据客户自身需求定制个性化服务，专门客户专人跟进，专门处理，不会混箱，保证清关速度。另外我们与Amazon指定的拖车行合作，保证性价比最高的派送服务。我们提供海运、空运、快递直达FBA仓。拥有自己的清关代理以及运输代理商，派送范围辐射整个欧盟成员国以及整个北美区域；一流的清关派送能力，保证客户的货物安全迅速到达FBA仓。在美国，加拿大，日本，欧洲英国，德国能能提供接受退换货，换标处理，重新打包，代发货亚马逊服务，让您的产品重新再次获得价值，避免货物损失。你身边的物流管家联系人：JackMobile ：+86-13728186537（微信同号）E-mail ： sales8600(a)hotmail.com

3 years, 9 months

澳门物流---专业大陆出口澳门直达物流---天天发车，时效今发明至

by 澳门物流---专业大陆出口澳� ��直达物流---� �天发车，时效今发明至

专业大陆出口澳门直达物流运输---天天发车，时效今发明至国内至澳门散货、整车专线运输。可提供运输、报关、清关、上门提货等服务。澳门物流核心业务如下：1.提供大陆出口澳门散货拼车服务，全国各地装货直达澳门送货。2.提供澳门吨车、平板车、货柜车及其它特种车运输服务。3.承接国内前往澳门地区的展会物资、演出设备、等物流及报关。4.承接前往澳门地区的大型建材及各类型生活用品的物流服务。你身边的澳门物流庄家联系人：沈小姐Mobile ：+86-15820839997E-mail : jane56852(a)hotmail.com

3 years, 9 months

广$告

by daniel

现-有f多d出f的e發/票w可t開U 可验-证后付-款//杨生电话：   l 35-3336-4568      ：微信同步一切无生命的物体都将变成透明状态

3 years, 9 months

CONGRATULATION.

by THE SCOTT FOUNDATION

Dear Beneficiary, After signing the Giving Pledge in 2019, I decided I was going to give away at least half of my fortune to charity and towards improving the lives of those in dire need of immediate support as a result of the Covid-19 pandemic. So far I have been able to give out $12 billion USD to charities, schools, churches, businesses and individuals across the globe through The Scott Foundation. I'm currently donating another $4 billion to charity. An online ballot was conducted from which your email emerged as one of the beneficiaries of my $6,850,000.00 USD donation to enable you resolve your financial challenges and to also reach out to those in need of support around your neighborhood. You are to contact MRS. AMELIA ALEXANDER for more information if you're interested in receiving this donation. MRS. AMELIA ALEXANDER ameliaalexander(a)scotsfoundation.org Congratulations. Yours Sincerely, Mary Lacofano (For) Mackenzie Scott

3 years, 10 months

專業展示用品製作，展櫃租用---適用於pop up store、短期店鋪、酒店活動、公關活動、陳列室、展廳及各大展覽

by 專業展示用品製作，展櫃租� ��---適用於pop up store� ��短期店鋪、� �店活動、公關活動、陳列室� ��展廳及各大� �覽

  專業展示用品製作，展櫃租用適用於pop up store、短期店鋪、酒店活動、公關活動、陳列室、展廳及各大展覽我們也是香港貨存量最多的租用展櫃公司，提供多種款式予客人選用，並由專業運輸團隊送運. 本司專門提供商場及店舖展示用品設計、製作、運輸、派送、安裝一站式服務。國內自設廠房，經驗團隊嚴格控制生產質素，專人負責物流運輸，確保貨物準時送到。業務範圍包括展示架、陳列架、專櫃、展示櫃製作展櫃租用（已包租用及運輸之費用）   聯絡方式聯絡人：顏先生直接報價專線 (可WhatsApp)：95138896 或電郵至 hkpf852(a)hotmail.com      

3 years, 10 months

专业办理香港座机---在大陆享用香港信号

by 专业办理香港座机---按在大� ��享用香港信号

  专业办理香港座机在大陆享用香港信号不限制-通话时间座机套餐按月收费   Q   Q  ：483456665 E-mail ：hktel852(a)hotmail.com  

3 years, 11 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038