Commit 9aa0d0be authored by Nick Crews's avatar Nick Crews Committed by Alexandre Belloni

rtc: wilco-ec: Handle reading invalid times

If the RTC HW returns an invalid time, the rtc_year_days()
call would crash. This patch adds error logging in this
situation, and removes the tm_yday and tm_wday calculations.
These fields should not be relied upon by userspace
according to man rtc, and thus we don't need to calculate
them.
Signed-off-by: default avatarNick Crews <ncrews@chromium.org>
Reviewed-by: default avatarDaniel Campello <campello@chromium.org>
Link: https://lore.kernel.org/r/20191004142608.170159-1-ncrews@chromium.orgSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 147dae76
...@@ -110,10 +110,12 @@ static int wilco_ec_rtc_read(struct device *dev, struct rtc_time *tm) ...@@ -110,10 +110,12 @@ static int wilco_ec_rtc_read(struct device *dev, struct rtc_time *tm)
tm->tm_mday = rtc.day; tm->tm_mday = rtc.day;
tm->tm_mon = rtc.month - 1; tm->tm_mon = rtc.month - 1;
tm->tm_year = rtc.year + (rtc.century * 100) - 1900; tm->tm_year = rtc.year + (rtc.century * 100) - 1900;
tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); /* Ignore other tm fields, man rtc says userspace shouldn't use them. */
/* Don't compute day of week, we don't need it. */ if (rtc_valid_tm(tm)) {
tm->tm_wday = -1; dev_err(dev, "Time from RTC is invalid: %ptRr\n", tm);
return -EIO;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment