Skip to content

Commit 7482120

Browse files
amergnatgregkh
authored andcommitted
rtc: Fix offset calculation for .start_secs < 0
[ Upstream commit fe9f5f96cfe8b82d0f24cbfa93718925560f4f8d ] 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]> Signed-off-by: Sasha Levin <[email protected]>
1 parent da2ca28 commit 7482120

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
@@ -314,7 +314,7 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
314314
*
315315
* Otherwise the offset seconds should be 0.
316316
*/
317-
if (rtc->start_secs > rtc->range_max ||
317+
if ((rtc->start_secs >= 0 && rtc->start_secs > rtc->range_max) ||
318318
rtc->start_secs + range_secs - 1 < rtc->range_min)
319319
rtc->offset_secs = rtc->start_secs - rtc->range_min;
320320
else if (rtc->start_secs > rtc->range_min)

0 commit comments

Comments
 (0)