Skip to content

Commit fe9f5f9

Browse files
amergnatalexandrebelloni
authored andcommitted
rtc: Fix offset calculation for .start_secs < 0
The comparison rtc->start_secs > rtc->range_max has a signed left-hand side and an unsigned right-hand side. So the comparison might become true for negative start_secs which is interpreted as a (possibly very large) positive value. As a negative value can never be bigger than an unsigned value the correct representation of the (mathematical) comparison rtc->start_secs > rtc->range_max in C is: rtc->start_secs >= 0 && rtc->start_secs > rtc->range_max Use that to fix the offset calculation currently used in the rtc-mt6397 driver. Fixes: 9895156 ("rtc: Add one offset seconds to expand RTC range") Signed-off-by: Alexandre Mergnat <[email protected]> Reviewed-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 7df4cfe commit fe9f5f9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/rtc/class.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
326326
*
327327
* Otherwise the offset seconds should be 0.
328328
*/
329-
if (rtc->start_secs > rtc->range_max ||
329+
if ((rtc->start_secs >= 0 && rtc->start_secs > rtc->range_max) ||
330330
rtc->start_secs + range_secs - 1 < rtc->range_min)
331331
rtc->offset_secs = rtc->start_secs - rtc->range_min;
332332
else if (rtc->start_secs > rtc->range_min)

0 commit comments

Comments
 (0)