powerpc: Avoid giving out RTC dates below EPOCH
PATCH 1/1 powerpc: Avoid giving out RTC dates below EPOCH
Doing so causes xtime to be negative which crashes the timekeeping code in funny ways when doing suspend/resume
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/powerpc/kernel/time.c +14 -1
@@ -777,7 +777,7 @@ int update_persistent_clock(struct timespec now)return ppc_md.set_rtc_time (&tm); } -void read_persistent_clock (struct timespec *ts) +static void __read_persistent_clock (struct timespec *ts) {struct rtc_time tm;static int first =1 ;
@@ -800,10 +800,23 @@ void read_persistent_clock(struct timespec *ts)return ; } ppc_md.get_rtc_time (&tm); + ts->tv_sec =mktime (tm.tm_year+1900 , tm.tm_mon+1 , tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); } +void read_persistent_clock (struct timespec *ts) +{ +__read_persistent_clock (&ts); + +/* Sanitize it in case real time clock is set below EPOCH */ +if (ts->tv_sec <0 ) { + ts->tv_sec =0 ; + ts->tv_nsec =0 ; + } + +} +/* clocksource code */ static cycle_t rtc_read (struct clocksource *cs) {
arch/powerpc/kernel/time.c void read_persistent_clock(struct timespec *ts) · line 810
Quoted 9 lines · Benjamin Herrenschmidt
Doing so causes xtime to be negative which crashes the timekeeping code in funny ways when doing suspend/resume
Signed-off-by Benjamin Herrenschmidt <[email protected]>---
arch/powerpc/kernel/time.c +3
-0+void read_persistent_clock (struct timespec *ts) +{ +__read_persistent_clock (&ts);
Should read
+ __read_persistent_clock(ts);
Forgot a quilt ref ;-)
Cheers,
Ben.
Quoted 18 lines
arch/powerpc/kernel/time.c +8
-0+/* Sanitize it in case real time clock is set below EPOCH */ +if (ts->tv_sec <0 ) { + ts->tv_sec =0 ; + ts->tv_nsec =0 ; + } + +} +/* clocksource code */ static cycle_t rtc_read (struct clocksource *cs) {_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev