Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: hp_sdc_rtc - fix y2038 problem in proc_show

Browse Source 
hp_sdc_rtc_proc_show() use timeval to store the time, which will overflow
in 2038.

This patch fixes this problem by replacing timeval with timespec64.
hp_sdc_rtc_proc_show() only output string, so that userspace will work
normally if we apply this patch.

Not all timer in i8042 have y2038 risk(handshake, match timer, etc),
Replacements in those timer are just for consistency.

Signed-off-by: WEN Pingbo <pingbo.wen@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
WEN Pingbo 2015-10-18 16:33:47 -07:00 committed by Dmitry Torokhov
parent 2e9776e0c8
commit ba564e7897
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/input/misc/hp_sdc_rtc.c
View File

@ -198,7 +198,7 @@ static int64_t hp_sdc_rtc_read_i8042timer (uint8_t loadcmd, int numreg)
/* Read the i8042 real-time clock */ /* Read the i8042 real-time clock */
static inline int hp_sdc_rtc_read_rt(struct timeval *res) { static inline int hp_sdc_rtc_read_rt(struct timespec64 *res) {
int64_t raw; int64_t raw;
uint32_t tenms; uint32_t tenms;
unsigned int days; unsigned int days;
@ -209,15 +209,15 @@ static inline int hp_sdc_rtc_read_rt(struct timeval *res) {
tenms = (uint32_t)raw & 0xffffff; tenms = (uint32_t)raw & 0xffffff;
days = (unsigned int)(raw >> 24) & 0xffff; days = (unsigned int)(raw >> 24) & 0xffff;
res->tv_usec = (suseconds_t)(tenms % 100) * 10000; res->tv_nsec = (long)(tenms % 100) * 10000 * 1000;
res->tv_sec = (time_t)(tenms / 100) + days * 86400; res->tv_sec = (tenms / 100) + (time64_t)days * 86400;
return 0; return 0;
} }
/* Read the i8042 fast handshake timer */ /* Read the i8042 fast handshake timer */
static inline int hp_sdc_rtc_read_fhs(struct timeval *res) { static inline int hp_sdc_rtc_read_fhs(struct timespec64 *res) {
int64_t raw; int64_t raw;
unsigned int tenms; unsigned int tenms;
@ -226,15 +226,15 @@ static inline int hp_sdc_rtc_read_fhs(struct timeval *res) {
tenms = (unsigned int)raw & 0xffff; tenms = (unsigned int)raw & 0xffff;
res->tv_usec = (suseconds_t)(tenms % 100) * 10000; res->tv_nsec = (long)(tenms % 100) * 10000 * 1000;
res->tv_sec = (time_t)(tenms / 100); res->tv_sec = (time64_t)(tenms / 100);
return 0; return 0;
} }
/* Read the i8042 match timer (a.k.a. alarm) */ /* Read the i8042 match timer (a.k.a. alarm) */
static inline int hp_sdc_rtc_read_mt(struct timeval *res) { static inline int hp_sdc_rtc_read_mt(struct timespec64 *res) {
int64_t raw; int64_t raw;
uint32_t tenms; uint32_t tenms;
@ -243,15 +243,15 @@ static inline int hp_sdc_rtc_read_mt(struct timeval *res) {
tenms = (uint32_t)raw & 0xffffff; tenms = (uint32_t)raw & 0xffffff;
res->tv_usec = (suseconds_t)(tenms % 100) * 10000; res->tv_nsec = (long)(tenms % 100) * 10000 * 1000;
res->tv_sec = (time_t)(tenms / 100); res->tv_sec = (time64_t)(tenms / 100);
return 0; return 0;
} }
/* Read the i8042 delay timer */ /* Read the i8042 delay timer */
static inline int hp_sdc_rtc_read_dt(struct timeval *res) { static inline int hp_sdc_rtc_read_dt(struct timespec64 *res) {
int64_t raw; int64_t raw;
uint32_t tenms; uint32_t tenms;
@ -260,15 +260,15 @@ static inline int hp_sdc_rtc_read_dt(struct timeval *res) {
tenms = (uint32_t)raw & 0xffffff; tenms = (uint32_t)raw & 0xffffff;
res->tv_usec = (suseconds_t)(tenms % 100) * 10000; res->tv_nsec = (long)(tenms % 100) * 10000 * 1000;
res->tv_sec = (time_t)(tenms / 100); res->tv_sec = (time64_t)(tenms / 100);
return 0; return 0;
} }
/* Read the i8042 cycle timer (a.k.a. periodic) */ /* Read the i8042 cycle timer (a.k.a. periodic) */
static inline int hp_sdc_rtc_read_ct(struct timeval *res) { static inline int hp_sdc_rtc_read_ct(struct timespec64 *res) {
int64_t raw; int64_t raw;
uint32_t tenms; uint32_t tenms;
@ -277,8 +277,8 @@ static inline int hp_sdc_rtc_read_ct(struct timeval *res) {
tenms = (uint32_t)raw & 0xffffff; tenms = (uint32_t)raw & 0xffffff;
res->tv_usec = (suseconds_t)(tenms % 100) * 10000; res->tv_nsec = (long)(tenms % 100) * 10000 * 1000;
res->tv_sec = (time_t)(tenms / 100); res->tv_sec = (time64_t)(tenms / 100);
return 0; return 0;
} }
@ -433,7 +433,7 @@ static int hp_sdc_rtc_proc_show(struct seq_file *m, void *v)
#define YN(bit) ("no") #define YN(bit) ("no")
#define NY(bit) ("yes") #define NY(bit) ("yes")
struct rtc_time tm; struct rtc_time tm;
struct timeval tv; struct timespec64 tv;
memset(&tm, 0, sizeof(struct rtc_time)); memset(&tm, 0, sizeof(struct rtc_time));
@ -452,36 +452,36 @@ static int hp_sdc_rtc_proc_show(struct seq_file *m, void *v)
if (hp_sdc_rtc_read_rt(&tv)) { if (hp_sdc_rtc_read_rt(&tv)) {
seq_puts(m, "i8042 rtc\t: READ FAILED!\n"); seq_puts(m, "i8042 rtc\t: READ FAILED!\n");
} else { } else {
seq_printf(m, "i8042 rtc\t: %ld.%02d seconds\n", seq_printf(m, "i8042 rtc\t: %lld.%02ld seconds\n",
tv.tv_sec, (int)tv.tv_usec/1000); (s64)tv.tv_sec, (long)tv.tv_nsec/1000000L);
} }
if (hp_sdc_rtc_read_fhs(&tv)) { if (hp_sdc_rtc_read_fhs(&tv)) {
seq_puts(m, "handshake\t: READ FAILED!\n"); seq_puts(m, "handshake\t: READ FAILED!\n");
} else { } else {
seq_printf(m, "handshake\t: %ld.%02d seconds\n", seq_printf(m, "handshake\t: %lld.%02ld seconds\n",
tv.tv_sec, (int)tv.tv_usec/1000); (s64)tv.tv_sec, (long)tv.tv_nsec/1000000L);
} }
if (hp_sdc_rtc_read_mt(&tv)) { if (hp_sdc_rtc_read_mt(&tv)) {
seq_puts(m, "alarm\t\t: READ FAILED!\n"); seq_puts(m, "alarm\t\t: READ FAILED!\n");
} else { } else {
seq_printf(m, "alarm\t\t: %ld.%02d seconds\n", seq_printf(m, "alarm\t\t: %lld.%02ld seconds\n",
tv.tv_sec, (int)tv.tv_usec/1000); (s64)tv.tv_sec, (long)tv.tv_nsec/1000000L);
} }
if (hp_sdc_rtc_read_dt(&tv)) { if (hp_sdc_rtc_read_dt(&tv)) {
seq_puts(m, "delay\t\t: READ FAILED!\n"); seq_puts(m, "delay\t\t: READ FAILED!\n");
} else { } else {
seq_printf(m, "delay\t\t: %ld.%02d seconds\n", seq_printf(m, "delay\t\t: %lld.%02ld seconds\n",
tv.tv_sec, (int)tv.tv_usec/1000); (s64)tv.tv_sec, (long)tv.tv_nsec/1000000L);
} }
if (hp_sdc_rtc_read_ct(&tv)) { if (hp_sdc_rtc_read_ct(&tv)) {
seq_puts(m, "periodic\t: READ FAILED!\n"); seq_puts(m, "periodic\t: READ FAILED!\n");
} else { } else {
seq_printf(m, "periodic\t: %ld.%02d seconds\n", seq_printf(m, "periodic\t: %lld.%02ld seconds\n",
tv.tv_sec, (int)tv.tv_usec/1000); (s64)tv.tv_sec, (long)tv.tv_nsec/1000000L);
} }
seq_printf(m, seq_printf(m,