Y2038

y2038@lists.linaro.org

1 participants
1127 discussions

[PATCH] Staging: fbtbt: Replace timespec with timespec64

by Ksenija Stanojevic

struct timespec will overflow in year 2038, so replace it with timespec64. And replace functions that use struct timespec, timespec_sub with timespec64_sub and getnstimeofday with getnstimeofday64. Also use parameters to convert the timespec64 values instead of hard code. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- drivers/staging/fbtft/fbtft-core.c | 26 +++++++++++++------------- drivers/staging/fbtft/fbtft.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 23392eb..3e4eeac 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -365,16 +365,16 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, unsigned end_line) { size_t offset, len; - struct timespec ts_start, ts_end, ts_fps, ts_duration; + struct timespec64 ts_start, ts_end, ts_fps, ts_duration; long fps_ms, fps_us, duration_ms, duration_us; - long fps, throughput; + long long fps, throughput; bool timeit = false; int ret = 0; if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE | DEBUG_TIME_EACH_UPDATE))) { if ((par->debug & DEBUG_TIME_EACH_UPDATE) || ((par->debug & DEBUG_TIME_FIRST_UPDATE) && !par->first_update_done)) { - getnstimeofday(&ts_start); + getnstimeofday64(&ts_start); timeit = true; } } @@ -411,28 +411,28 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, __func__); if (unlikely(timeit)) { - getnstimeofday(&ts_end); + getnstimeofday64(&ts_end); if (par->update_time.tv_nsec == 0 && par->update_time.tv_sec == 0) { par->update_time.tv_sec = ts_start.tv_sec; par->update_time.tv_nsec = ts_start.tv_nsec; } - ts_fps = timespec_sub(ts_start, par->update_time); + ts_fps = timespec64_sub(ts_start, par->update_time); par->update_time.tv_sec = ts_start.tv_sec; par->update_time.tv_nsec = ts_start.tv_nsec; - fps_ms = (ts_fps.tv_sec * 1000) + ((ts_fps.tv_nsec / 1000000) % 1000); - fps_us = (ts_fps.tv_nsec / 1000) % 1000; - fps = fps_ms * 1000 + fps_us; + fps_ms = (ts_fps.tv_sec * MSEC_PER_SEC) + (ts_fps.tv_nsec / NSEC_PER_MSEC); + fps_us = ts_fps.tv_nsec / NSEC_PER_USEC; + fps = fps_ms * USEC_PER_MSEC + fps_us; fps = fps ? 1000000 / fps : 0; - ts_duration = timespec_sub(ts_end, ts_start); - duration_ms = (ts_duration.tv_sec * 1000) + ((ts_duration.tv_nsec / 1000000) % 1000); - duration_us = (ts_duration.tv_nsec / 1000) % 1000; - throughput = duration_ms * 1000 + duration_us; + ts_duration = timespec64_sub(ts_end, ts_start); + duration_ms = (ts_duration.tv_sec * MSEC_PER_SEC) + (ts_duration.tv_nsec / NSEC_PER_MSEC); + duration_us = ts_duration.tv_nsec / NSEC_PER_USEC; + throughput = duration_ms * USEC_PER_MSEC + duration_us; throughput = throughput ? (len * 1000) / throughput : 0; throughput = throughput * 1000 / 1024; dev_info(par->info->device, - "Display update: %ld kB/s (%ld.%.3ld ms), fps=%ld (%ld.%.3ld ms)\n", + "Display update: %lld kB/s (%ld.%.3ld ms), fps=%lld (%ld.%.3ld ms)\n", throughput, duration_ms, duration_us, fps, fps_ms, fps_us); par->first_update_done = true; diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 7e9a506..bf4c358 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -251,7 +251,7 @@ struct fbtft_par { } gamma; unsigned long debug; bool first_update_done; - struct timespec update_time; + struct timespec64 update_time; bool bgr; void *extra; }; -- 1.9.1

9 years, 1 month

Delivery Notification, ID 000350274

by FedEx International Next Flight

Dear Customer, We could not deliver your item. Please, download Delivery Label attached to this email. Regards, Marion Mcbride, Operation Agent.

9 years, 1 month

[PATCH 00/37] staging/lustre: y2038 rework

by Arnd Bergmann

First of all, sorry for the overly long series that this turned into. I'm currently doing a survey of all code using time_t/timeval/timespec to get an idea of what work needs to be done where, in particular in terms of user interface changes. Lustre is by far the most pervasive user of time types and functions, and I could not even find my way through the code to see what needs to be done other than actually doing that work. On most other subsystems, we try to use montonic times where possible for in-kernel uses. I did not do that here but kept using wall-clock times, in order to leave the debug output and procfs files untouched. A follow-up series could convert a lot of the ktime_get_real_*() to ktime_get_*() to change that if we don't care about the format. There are a couple of things that I left unchanged: - Socket timestamps in drivers/staging/lustre/lnet/lnet/lib-socket.c need to wait for the socket API to be changed first - inode timestamps need to be changed in VFS, which is a larger work - The conrpc selftest has a user interface based on timeval that is hard to change. All patches are based on staging-testing and built-tested on 32-bit arm and x86 as well as 64-bit arm. Arnd Bergmann (37): staging/lustre: use jiffies for lp_last_query times staging/lustre: use 64-bit inode timestamps internally staging/lustre: obd: remove unused data structures staging/lustre: tracefile: use 64-bit seconds staging/lustre: use 64-bit timestamps in procfs output staging/lustre: use time64_t for l_last_activity staging/lustre: use ktime_t for calculating elapsed time staging/lustre: change rq_at_index type staging/lustre: avoid unnecessary timeval conversion staging/lustre: use 64-bit time LNetCtl() staging/lustre: use 'long' return type for cfs_duration_sec() staging/lustre: use jiffies_to_timeval() instead of cfs_duration_usec staging/lustre: use 64-bit ibn_incarnation computation staging/lustre: use 64-bit times for lnet_shuffle_seed staging/lustre: use 64-bit computation in s2dhms() staging/lustre: use 64-bit timestamps for selftest staging/lustre: use 64-bit time for pl_recalc staging/lustre: use 64-bit time for obd eviction staging/lustre: use 64-bit time for procfs output staging/lustre: use 64-bit time for adaptive timeout staging/lustre: use 64-bit llite procfs timestamps staging/lustre: use 64-bit times for ksnd_connd staging/lustre: use 64-bit time for ni_last_alive staging/lustre: use 64-bit time for selftest staging/lustre: partially use time64_t for capa expiry staging/lustre: use 64-bit times in ptlrpc_enc_page_pool staging/lustre: use 64-bit times in debug print staging/lustre: use 64-bit times in another debug print staging/lustre: use 64-bit timestamps for mdc staging/lustre: use 64-bit times for ptlrpc sec expiry staging/lustre: use 64-bit times for ptlrpc_sec staging/lustre: use 64-bit times for exp_last_request_time staging/lustre: use 64-bit times for request times staging/lustre: remove a bit of dead code staging/lustre: remove wrappers for timer functions staging/lustre: remove unused time handling functions staging/lustre: remove CFS_TIME_T definition .../lustre/include/linux/libcfs/libcfs_debug.h | 4 +- .../lustre/include/linux/libcfs/libcfs_prim.h | 13 -- .../lustre/include/linux/libcfs/libcfs_time.h | 49 -------- .../lustre/include/linux/libcfs/linux/linux-time.h | 35 +----- .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +- .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 6 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 +- .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 8 +- drivers/staging/lustre/lnet/lnet/api-ni.c | 6 +- drivers/staging/lustre/lnet/lnet/config.c | 2 +- drivers/staging/lustre/lnet/lnet/lib-eq.c | 9 +- drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +- drivers/staging/lustre/lnet/lnet/router.c | 10 +- drivers/staging/lustre/lnet/lnet/router_proc.c | 2 +- drivers/staging/lustre/lnet/selftest/conctl.c | 2 +- drivers/staging/lustre/lnet/selftest/conrpc.c | 10 +- drivers/staging/lustre/lnet/selftest/console.c | 2 +- drivers/staging/lustre/lnet/selftest/console.h | 2 +- drivers/staging/lustre/lnet/selftest/framework.c | 5 +- drivers/staging/lustre/lnet/selftest/ping_test.c | 12 +- drivers/staging/lustre/lnet/selftest/rpc.c | 9 +- drivers/staging/lustre/lnet/selftest/selftest.h | 2 +- drivers/staging/lustre/lnet/selftest/timer.c | 14 +-- drivers/staging/lustre/lnet/selftest/timer.h | 2 +- drivers/staging/lustre/lustre/include/cl_object.h | 6 +- .../staging/lustre/lustre/include/lprocfs_status.h | 6 +- .../lustre/lustre/include/lustre/lustre_idl.h | 1 + .../staging/lustre/lustre/include/lustre_capa.h | 16 ++- drivers/staging/lustre/lustre/include/lustre_dlm.h | 6 +- .../staging/lustre/lustre/include/lustre_export.h | 7 +- .../staging/lustre/lustre/include/lustre_import.h | 14 +-- drivers/staging/lustre/lustre/include/lustre_net.h | 24 ++-- drivers/staging/lustre/lustre/include/lustre_sec.h | 2 +- drivers/staging/lustre/lustre/include/obd.h | 97 +-------------- drivers/staging/lustre/lustre/include/obd_class.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 30 ++--- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 29 ++--- drivers/staging/lustre/lustre/libcfs/debug.c | 4 +- .../lustre/lustre/libcfs/linux/linux-prim.c | 70 ----------- .../lustre/lustre/libcfs/linux/linux-tracefile.c | 8 +- drivers/staging/lustre/lustre/libcfs/module.c | 3 - drivers/staging/lustre/lustre/llite/file.c | 2 +- .../staging/lustre/lustre/llite/llite_internal.h | 2 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 24 ++-- drivers/staging/lustre/lustre/llite/super25.c | 6 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +- drivers/staging/lustre/lustre/llite/vvp_object.c | 12 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 2 +- drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog.c | 2 +- .../lustre/lustre/obdclass/lprocfs_status.c | 27 ++--- .../lustre/lustre/obdclass/lustre_handles.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 13 +- .../staging/lustre/lustre/obdecho/echo_client.c | 4 +- drivers/staging/lustre/lustre/osc/lproc_osc.c | 16 +-- drivers/staging/lustre/lustre/osc/osc_io.c | 6 +- drivers/staging/lustre/lustre/osc/osc_request.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/client.c | 48 ++++---- drivers/staging/lustre/lustre/ptlrpc/events.c | 8 +- drivers/staging/lustre/lustre/ptlrpc/import.c | 14 +-- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 16 +-- drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 10 +- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 29 +++-- drivers/staging/lustre/lustre/ptlrpc/sec.c | 28 ++--- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 29 +++-- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 135 +++++++++++---------- 77 files changed, 380 insertions(+), 652 deletions(-) -- 2.1.0.rc2

9 years, 2 months

Your E-Ticket information, order #0000996496

by America Airlines

Dear customer, Your payment has been processed and your credit card has been charged. Please print your e-ticket attached to this email. Order details and e-ticket information: FLIGHT NUMBER - ET599232 DATE & TIME - Sep 30 2015, 21:50 DEPARTING - Long Beach TOTAL PRICE - $ 350.00 Thank you for flying with America Airlines.

9 years, 2 months

[PATCH] Replace get_seconds with ktime_get_seconds

by Ksenija Stanojevic

Replace time_t type and get_seconds function which are not y2038 safe on 32-bit systems. Function ktime_get_seconds use monotonic instead of real time and therefore will not cause overflow. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> --- net/rxrpc/ar-connection.c | 4 ++-- net/rxrpc/ar-internal.h | 4 ++-- net/rxrpc/ar-transport.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 6631f4f..692b3e6 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -808,7 +808,7 @@ void rxrpc_put_connection(struct rxrpc_connection *conn) ASSERTCMP(atomic_read(&conn->usage), >, 0); - conn->put_time = get_seconds(); + conn->put_time = ktime_get_seconds(); if (atomic_dec_and_test(&conn->usage)) { _debug("zombie"); rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0); @@ -852,7 +852,7 @@ static void rxrpc_connection_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; write_lock_bh(&rxrpc_connection_lock); diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index aef1bd2..2934a73 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -208,7 +208,7 @@ struct rxrpc_transport { struct rb_root server_conns; /* server connections on this transport */ struct list_head link; /* link in master session list */ struct sk_buff_head error_queue; /* error packets awaiting processing */ - time_t put_time; /* time at which to reap */ + unsigned long put_time; /* time at which to reap */ spinlock_t client_lock; /* client connection allocation lock */ rwlock_t conn_lock; /* lock for active/dead connections */ atomic_t usage; @@ -256,7 +256,7 @@ struct rxrpc_connection { struct rxrpc_crypt csum_iv; /* packet checksum base */ unsigned long events; #define RXRPC_CONN_CHALLENGE 0 /* send challenge packet */ - time_t put_time; /* time at which to reap */ + unsigned long put_time; /* time at which to reap */ rwlock_t lock; /* access lock */ spinlock_t state_lock; /* state-change lock */ atomic_t usage; diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 1976dec..9946467 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c @@ -189,7 +189,7 @@ void rxrpc_put_transport(struct rxrpc_transport *trans) ASSERTCMP(atomic_read(&trans->usage), >, 0); - trans->put_time = get_seconds(); + trans->put_time = ktime_get_seconds(); if (unlikely(atomic_dec_and_test(&trans->usage))) { _debug("zombie"); /* let the reaper determine the timeout to avoid a race with @@ -226,7 +226,7 @@ static void rxrpc_transport_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; /* extract all the transports that have been dead too long */ -- 1.9.1

9 years, 2 months

[PATCH] dummy_hcd: replace timeval with timespec64

by WEN Pingbo

- what is the time_t/timeval/timespec type used for in this driver the timeval in dummy_g_get_frame is used for getting frame number in every ms. - is this broken in 2038 or not No. The millisecond of the last second will be normal if tv_sec is overflowed. But for consistency purpose, and avoiding further risks, I have replaced timeval with timespec64. - does the driver use monotonic or real time Real time. But only microsecond part is used. - if it uses real time, should it use monotonic time instead Monotonic time will be ok if it can meet the precise requirement(us). Signed-off-by: WEN Pingbo <pingbo.wen(a)linaro.org> Cc: Y2038 <y2038(a)lists.linaro.org> --- drivers/usb/gadget/udc/dummy_hcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c index 1379ad4..7be721dad 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -833,10 +833,10 @@ static const struct usb_ep_ops dummy_ep_ops = { /* there are both host and device side versions of this call ... */ static int dummy_g_get_frame(struct usb_gadget *_gadget) { - struct timeval tv; + struct timespec64 tv; - do_gettimeofday(&tv); - return tv.tv_usec / 1000; + getnstimeofday64(&tv); + return tv.tv_nsec / 1000000L; } static int dummy_wakeup(struct usb_gadget *_gadget) -- 1.9.1

9 years, 2 months

[PATCH v2] Replace get_seconds with ktime_get_seconds

by Ksenija Stanojevic

Replaces time_t type and get_seconds function which are not y2038 safe on 32-bit systems. Function ktime_get_seconds use monotonic instead of real time and therefore will not cause overflow. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- Changes in v2: - change put_time to unsigned long type - change commit message net/rxrpc/ar-connection.c | 4 ++-- net/rxrpc/ar-internal.h | 4 ++-- net/rxrpc/ar-transport.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 6631f4f..692b3e6 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -808,7 +808,7 @@ void rxrpc_put_connection(struct rxrpc_connection *conn) ASSERTCMP(atomic_read(&conn->usage), >, 0); - conn->put_time = get_seconds(); + conn->put_time = ktime_get_seconds(); if (atomic_dec_and_test(&conn->usage)) { _debug("zombie"); rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0); @@ -852,7 +852,7 @@ static void rxrpc_connection_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; write_lock_bh(&rxrpc_connection_lock); diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index aef1bd2..2934a73 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -208,7 +208,7 @@ struct rxrpc_transport { struct rb_root server_conns; /* server connections on this transport */ struct list_head link; /* link in master session list */ struct sk_buff_head error_queue; /* error packets awaiting processing */ - time_t put_time; /* time at which to reap */ + unsigned long put_time; /* time at which to reap */ spinlock_t client_lock; /* client connection allocation lock */ rwlock_t conn_lock; /* lock for active/dead connections */ atomic_t usage; @@ -256,7 +256,7 @@ struct rxrpc_connection { struct rxrpc_crypt csum_iv; /* packet checksum base */ unsigned long events; #define RXRPC_CONN_CHALLENGE 0 /* send challenge packet */ - time_t put_time; /* time at which to reap */ + unsigned long put_time; /* time at which to reap */ rwlock_t lock; /* access lock */ spinlock_t state_lock; /* state-change lock */ atomic_t usage; diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 1976dec..9946467 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c @@ -189,7 +189,7 @@ void rxrpc_put_transport(struct rxrpc_transport *trans) ASSERTCMP(atomic_read(&trans->usage), >, 0); - trans->put_time = get_seconds(); + trans->put_time = ktime_get_seconds(); if (unlikely(atomic_dec_and_test(&trans->usage))) { _debug("zombie"); /* let the reaper determine the timeout to avoid a race with @@ -226,7 +226,7 @@ static void rxrpc_transport_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; /* extract all the transports that have been dead too long */ -- 1.9.1

9 years, 2 months

[PATCH v3] net: rxrpc: Replace time_t with time64_t

by Ksenija Stanojevic

Replace all instances of time_t with time64_t i.e. change the type used for representing time from 32-bit to 64-bit. All 32-bit kernels to date use a signed 32-bit time_t type, which can only represent time until January 2038. The patch also changes the function get_seconds() that returns a 32-bit integer to ktime_get_seconds() that returns seconds as 64-bit integer and it uses monotonic instead of real time clock. Field expiry is changed to u64 in struct rxrpc_key_data_v1 and struct rxkad_key and to time64_t in key_preparsed_payload. This change is safe since field expiry is used only in this driver. Add macro ENCODE32 to export 64bit time to userspace as a 32bit data. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- Changes in v3: - use ENCODE32 instead of ENCODE64 macro Changes in v2: - change the type of field expiry. - modify the assignement of field put_time. - modify the assignement of variable issue. include/keys/rxrpc-type.h | 4 ++-- include/linux/key-type.h | 2 +- net/rxrpc/ar-connection.c | 4 ++-- net/rxrpc/ar-internal.h | 6 +++--- net/rxrpc/ar-key.c | 16 +++++++++++----- net/rxrpc/ar-transport.c | 4 ++-- net/rxrpc/rxkad.c | 15 ++++++++------- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/include/keys/rxrpc-type.h b/include/keys/rxrpc-type.h index fc48754..f13b2cb 100644 --- a/include/keys/rxrpc-type.h +++ b/include/keys/rxrpc-type.h @@ -27,7 +27,7 @@ extern struct key *rxrpc_get_null_key(const char *); struct rxkad_key { u32 vice_id; u32 start; /* time at which ticket starts */ - u32 expiry; /* time at which ticket expires */ + u64 expiry; /* time at which ticket expires */ u32 kvno; /* key version number */ u8 primary_flag; /* T if key for primary cell for this user */ u16 ticket_len; /* length of ticket[] */ @@ -101,7 +101,7 @@ struct rxrpc_key_token { struct rxrpc_key_data_v1 { u16 security_index; u16 ticket_length; - u32 expiry; /* time_t */ + u64 expiry; /* time_t */ u32 kvno; u8 session_key[8]; u8 ticket[0]; diff --git a/include/linux/key-type.h b/include/linux/key-type.h index ff9f1d3..ff59683 100644 --- a/include/linux/key-type.h +++ b/include/linux/key-type.h @@ -45,7 +45,7 @@ struct key_preparsed_payload { const void *data; /* Raw data */ size_t datalen; /* Raw datalen */ size_t quotalen; /* Quota length for proposed payload */ - time_t expiry; /* Expiry time of key */ + time64_t expiry; /* Expiry time of key */ bool trusted; /* True if key is trusted */ }; diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 6631f4f..692b3e6 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -808,7 +808,7 @@ void rxrpc_put_connection(struct rxrpc_connection *conn) ASSERTCMP(atomic_read(&conn->usage), >, 0); - conn->put_time = get_seconds(); + conn->put_time = ktime_get_seconds(); if (atomic_dec_and_test(&conn->usage)) { _debug("zombie"); rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0); @@ -852,7 +852,7 @@ static void rxrpc_connection_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; write_lock_bh(&rxrpc_connection_lock); diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index aef1bd2..24207db 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -208,7 +208,7 @@ struct rxrpc_transport { struct rb_root server_conns; /* server connections on this transport */ struct list_head link; /* link in master session list */ struct sk_buff_head error_queue; /* error packets awaiting processing */ - time_t put_time; /* time at which to reap */ + time64_t put_time; /* time at which to reap */ spinlock_t client_lock; /* client connection allocation lock */ rwlock_t conn_lock; /* lock for active/dead connections */ atomic_t usage; @@ -256,7 +256,7 @@ struct rxrpc_connection { struct rxrpc_crypt csum_iv; /* packet checksum base */ unsigned long events; #define RXRPC_CONN_CHALLENGE 0 /* send challenge packet */ - time_t put_time; /* time at which to reap */ + time64_t put_time; /* time at which to reap */ rwlock_t lock; /* access lock */ spinlock_t state_lock; /* state-change lock */ atomic_t usage; @@ -541,7 +541,7 @@ extern struct key_type key_type_rxrpc_s; int rxrpc_request_key(struct rxrpc_sock *, char __user *, int); int rxrpc_server_keyring(struct rxrpc_sock *, char __user *, int); -int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t, +int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time64_t, u32); /* diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index db0f39f..c190cb1 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c @@ -125,14 +125,14 @@ static int rxrpc_preparse_xdr_rxkad(struct key_preparsed_payload *prep, token->kad->vice_id = ntohl(xdr[0]); token->kad->kvno = ntohl(xdr[1]); token->kad->start = ntohl(xdr[4]); - token->kad->expiry = ntohl(xdr[5]); + token->kad->expiry = (long long)ntohl(xdr[5]); token->kad->primary_flag = ntohl(xdr[6]); memcpy(&token->kad->session_key, &xdr[2], 8); memcpy(&token->kad->ticket, &xdr[8], tktlen); _debug("SCIX: %u", token->security_index); _debug("TLEN: %u", token->kad->ticket_len); - _debug("EXPY: %x", token->kad->expiry); + _debug("EXPY: %lld", token->kad->expiry); _debug("KVNO: %u", token->kad->kvno); _debug("PRIM: %u", token->kad->primary_flag); _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x", @@ -727,7 +727,7 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep) _debug("SCIX: %u", v1->security_index); _debug("TLEN: %u", v1->ticket_length); - _debug("EXPY: %x", v1->expiry); + _debug("EXPY: %lld", v1->expiry); _debug("KVNO: %u", v1->kvno); _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x", v1->session_key[0], v1->session_key[1], @@ -961,7 +961,7 @@ int rxrpc_server_keyring(struct rxrpc_sock *rx, char __user *optval, */ int rxrpc_get_server_data_key(struct rxrpc_connection *conn, const void *session_key, - time_t expiry, + time64_t expiry, u32 kvno) { const struct cred *cred = current_cred(); @@ -1134,6 +1134,12 @@ static long rxrpc_read(const struct key *key, if (put_user(y, xdr++) < 0) \ goto fault; \ } while(0) +#define ENCODE32(x) \ + do { \ + u32 z = (u32) x; \ + ENCODE(z); \ + } while(0) + #define ENCODE_DATA(l, s) \ do { \ u32 _l = (l); \ @@ -1175,7 +1181,7 @@ static long rxrpc_read(const struct key *key, ENCODE(token->kad->kvno); ENCODE_DATA(8, token->kad->session_key); ENCODE(token->kad->start); - ENCODE(token->kad->expiry); + ENCODE32(token->kad->expiry); ENCODE(token->kad->primary_flag); ENCODE_DATA(token->kad->ticket_len, token->kad->ticket); break; diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 1976dec..9946467 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c @@ -189,7 +189,7 @@ void rxrpc_put_transport(struct rxrpc_transport *trans) ASSERTCMP(atomic_read(&trans->usage), >, 0); - trans->put_time = get_seconds(); + trans->put_time = ktime_get_seconds(); if (unlikely(atomic_dec_and_test(&trans->usage))) { _debug("zombie"); /* let the reaper determine the timeout to avoid a race with @@ -226,7 +226,7 @@ static void rxrpc_transport_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; /* extract all the transports that have been dead too long */ diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index f226709..7c42437 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -17,6 +17,7 @@ #include <linux/scatterlist.h> #include <linux/ctype.h> #include <linux/slab.h> +#include <linux/time64.h> #include <net/sock.h> #include <net/af_rxrpc.h> #include <keys/rxrpc-type.h> @@ -819,7 +820,7 @@ protocol_error: static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, void *ticket, size_t ticket_len, struct rxrpc_crypt *_session_key, - time_t *_expiry, + time64_t *_expiry, u32 *_abort_code) { struct blkcipher_desc desc; @@ -827,7 +828,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, struct scatterlist sg[1]; struct in_addr addr; unsigned int life; - time_t issue, now; + time64_t issue, now; bool little_endian; int ret; u8 *p, *q, *name, *end; @@ -915,15 +916,15 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, if (little_endian) { __le32 stamp; memcpy(&stamp, p, 4); - issue = le32_to_cpu(stamp); + issue = le64_to_cpu((__le64)stamp); } else { __be32 stamp; memcpy(&stamp, p, 4); - issue = be32_to_cpu(stamp); + issue = be64_to_cpu((__be64)stamp); } p += 4; - now = get_seconds(); - _debug("KIV ISSUE: %lx [%lx]", issue, now); + now = ktime_get_seconds(); + _debug("KIV ISSUE: %lld [%lld]", issue, now); /* check the ticket is in date */ if (issue > now) { @@ -1003,7 +1004,7 @@ static int rxkad_verify_response(struct rxrpc_connection *conn, __attribute__((aligned(8))); /* must be aligned for crypto */ struct rxrpc_skb_priv *sp; struct rxrpc_crypt session_key; - time_t expiry; + time64_t expiry; void *ticket; u32 abort_code, version, kvno, ticket_len, level; __be32 csum; -- 1.9.1

9 years, 2 months

[PATCH] Replace get_seconds with ktime_get_seconds

by Ksenija Stanojevic

Replace get_seconds() which is not y2038 safe on 32bit systems. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- This patch is split out of the previous patch [PATCH v3] net: rxrpc: Replace time_t with time64_t. The rest of the changes is yet to be sent as separate patchset. net/rxrpc/ar-connection.c | 4 ++-- net/rxrpc/ar-transport.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 6631f4f..692b3e6 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -808,7 +808,7 @@ void rxrpc_put_connection(struct rxrpc_connection *conn) ASSERTCMP(atomic_read(&conn->usage), >, 0); - conn->put_time = get_seconds(); + conn->put_time = ktime_get_seconds(); if (atomic_dec_and_test(&conn->usage)) { _debug("zombie"); rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0); @@ -852,7 +852,7 @@ static void rxrpc_connection_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; write_lock_bh(&rxrpc_connection_lock); diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 1976dec..9946467 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c @@ -189,7 +189,7 @@ void rxrpc_put_transport(struct rxrpc_transport *trans) ASSERTCMP(atomic_read(&trans->usage), >, 0); - trans->put_time = get_seconds(); + trans->put_time = ktime_get_seconds(); if (unlikely(atomic_dec_and_test(&trans->usage))) { _debug("zombie"); /* let the reaper determine the timeout to avoid a race with @@ -226,7 +226,7 @@ static void rxrpc_transport_reaper(struct work_struct *work) _enter(""); - now = get_seconds(); + now = ktime_get_seconds(); earliest = ULONG_MAX; /* extract all the transports that have been dead too long */ -- 1.9.1

9 years, 2 months

[PATCH] dummy_hcd: replace timeval with timespec64

by WEN Pingbo

The millisecond of the last second will be normal if tv_sec is overflowed. But for y2038 consistency and demonstration purpose, and avoiding further risks, we still need to fix it here, to avoid similair problems. Signed-off-by: Pingbo Wen <pingbo.wen(a)linaro.org> Cc: Y2038 <y2038(a)lists.linaro.org> Cc: linux-kernel(a)vger.kernel.org Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Felipe Balbi <balbi(a)ti.com> --- drivers/usb/gadget/udc/dummy_hcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c index 1379ad4..7be721dad 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -833,10 +833,10 @@ static const struct usb_ep_ops dummy_ep_ops = { /* there are both host and device side versions of this call ... */ static int dummy_g_get_frame(struct usb_gadget *_gadget) { - struct timeval tv; + struct timespec64 tv; - do_gettimeofday(&tv); - return tv.tv_usec / 1000; + getnstimeofday64(&tv); + return tv.tv_nsec / 1000000L; } static int dummy_wakeup(struct usb_gadget *_gadget) -- 1.9.1

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038