linux-rtc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandre Mergnat <amergnat@baylibre.com>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>,
	 Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
	linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Alexandre Mergnat" <amergnat@baylibre.com>
Subject: [PATCH v4 2/5] rtc: Fix offset calculation for .start_secs < 0
Date: Mon, 28 Apr 2025 12:06:48 +0200	[thread overview]
Message-ID: <20250428-enable-rtc-v4-2-2b2f7e3f9349@baylibre.com> (raw)
In-Reply-To: <20250428-enable-rtc-v4-0-2b2f7e3f9349@baylibre.com>

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: 989515647e783 ("rtc: Add one offset seconds to expand RTC range")
Signed-off-by: Alexandre Mergnat <amergnat@baylibre.com>
---
 drivers/rtc/class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index e31fa0ad127e9545afac745a621d4ccbcd5fca28..a0afdeaac270f026734be8785e8ed7e1272b2348 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -327,7 +327,7 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
 	 *
 	 * Otherwise the offset seconds should be 0.
 	 */
-	if (rtc->start_secs > rtc->range_max ||
+	if ((rtc->start_secs >= 0 && rtc->start_secs > rtc->range_max) ||
 	    rtc->start_secs + range_secs - 1 < rtc->range_min)
 		rtc->offset_secs = rtc->start_secs - rtc->range_min;
 	else if (rtc->start_secs > rtc->range_min)

-- 
2.25.1


  parent reply	other threads:[~2025-04-28 10:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-28 10:06 [PATCH v4 0/5] Fix pre-1970 date handling Alexandre Mergnat
2025-04-28 10:06 ` [PATCH v4 1/5] rtc: Make rtc_time64_to_tm() support dates before 1970 Alexandre Mergnat
2025-04-28 16:59   ` Uwe Kleine-König
2025-05-06  7:58     ` Uwe Kleine-König
2025-05-28 10:33       ` Uwe Kleine-König
2025-04-28 10:06 ` Alexandre Mergnat [this message]
2025-04-28 17:00   ` [PATCH v4 2/5] rtc: Fix offset calculation for .start_secs < 0 Uwe Kleine-König
2025-04-28 10:06 ` [PATCH v4 3/5] rtc: test: Emit the seconds-since-1970 value instead of days-since-1970 amergnat
2025-04-28 10:06 ` [PATCH v4 4/5] rtc: test: Also test time and wday outcome of rtc_time64_to_tm() amergnat
2025-04-28 10:06 ` [PATCH v4 5/5] rtc: test: Test date conversion for dates starting in 1900 amergnat
2025-04-28 10:55 ` [PATCH v4 0/5] Fix pre-1970 date handling Alexandre Mergnat
2025-06-01 22:14 ` Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250428-enable-rtc-v4-2-2b2f7e3f9349@baylibre.com \
    --to=amergnat@baylibre.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rtc@vger.kernel.org \
    --cc=u.kleine-koenig@baylibre.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).