Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: interface: Validate alarm-time before handling rollover

In function __rtc_read_alarm() its possible for an alarm time-stamp to
be invalid even after replacing missing components with current
time-stamp. The condition 'alarm->time.tm_year < 70' will trigger this
case and will cause the call to 'rtc_tm_to_time64(&alarm->time)'
return a negative value for variable t_alm.

While handling alarm rollover this negative t_alm (assumed to seconds
offset from '1970-01-01 00:00:00') is converted back to rtc_time via
rtc_time64_to_tm() which results in this error log with seemingly
garbage values:

"rtc rtc0: invalid alarm value: -2-1--1041528741
2005511117:71582844:32"

This error was generated when the rtc driver (rtc-opal in this case)
returned an alarm time-stamp of '00-00-00 00:00:00' to indicate that
the alarm is disabled. Though I have submitted a separate fix for the
rtc-opal driver, this issue may potentially impact other
existing/future rtc drivers.

To fix this issue the patch validates the alarm time-stamp just after
filling up the missing datetime components and if rtc_valid_tm() still
reports it to be invalid then bails out of the function without
handling the rollover.

Reported-by: Steve Best <sbest@redhat.com>
Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

authored by

Vaibhav Jain and committed by
Alexandre Belloni
da96aea0 6dc1cf6f

+8 -1
+8 -1
drivers/rtc/interface.c
··· 227 227 missing = year; 228 228 } 229 229 230 + /* Can't proceed if alarm is still invalid after replacing 231 + * missing fields. 232 + */ 233 + err = rtc_valid_tm(&alarm->time); 234 + if (err) 235 + goto done; 236 + 230 237 /* with luck, no rollover is needed */ 231 238 t_now = rtc_tm_to_time64(&now); 232 239 t_alm = rtc_tm_to_time64(&alarm->time); ··· 285 278 dev_warn(&rtc->dev, "alarm rollover not handled\n"); 286 279 } 287 280 288 - done: 289 281 err = rtc_valid_tm(&alarm->time); 290 282 283 + done: 291 284 if (err) { 292 285 dev_warn(&rtc->dev, "invalid alarm value: %d-%d-%d %d:%d:%d\n", 293 286 alarm->time.tm_year + 1900, alarm->time.tm_mon + 1,