All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yu Liao <liaoyu15@huawei.com>
To: <john.stultz@linaro.org>, <tglx@linutronix.de>, <sboyd@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <wangxiongfeng2@huawei.com>,
	<liaoyu15@huawei.com>
Subject: [PATCH] time: Normalize timespec64 before timespec64_compare()
Date: Thu, 2 Dec 2021 21:07:07 +0800	[thread overview]
Message-ID: <20211202130707.3910459-1-liaoyu15@huawei.com> (raw)

Passing unnormalized timespec64 to timespec64_compare() may cause
incorrect results.

For example:
  wall_to_monotonic = {tv_sec = -10, tv_nsec = 900000000}
  ts_delta = {tv_sec = -9, tv_nsec = -900000000}

timespec64_compare() returns -1, but actually wall_to_monotonic > ts_delta.
This will cause wall_to_monotonic to become a positive number.

Use timespec64_sub() instead of direct subtraction to avoid this.

Signed-off-by: Yu Liao <liaoyu15@huawei.com>
---
 include/linux/time64.h    | 2 ++
 kernel/time/timekeeping.c | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/time64.h b/include/linux/time64.h
index 81b9686a2079..f74a36d253cd 100644
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
@@ -50,6 +50,8 @@ static inline int timespec64_equal(const struct timespec64 *a,
  * lhs < rhs:  return <0
  * lhs == rhs: return 0
  * lhs > rhs:  return >0
+ *
+ * Note: Both lhs and rhs must be normalized.
  */
 static inline int timespec64_compare(const struct timespec64 *lhs, const struct timespec64 *rhs)
 {
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index b348749a9fc6..dcdcb85121e4 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1306,8 +1306,7 @@ int do_settimeofday64(const struct timespec64 *ts)
 	timekeeping_forward_now(tk);
 
 	xt = tk_xtime(tk);
-	ts_delta.tv_sec = ts->tv_sec - xt.tv_sec;
-	ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec;
+	ts_delta = timespec64_sub(*ts, xt);
 
 	if (timespec64_compare(&tk->wall_to_monotonic, &ts_delta) > 0) {
 		ret = -EINVAL;
-- 
2.25.1


             reply	other threads:[~2021-12-02 13:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 13:07 Yu Liao [this message]
2021-12-09 12:50 ` [PATCH] time: Normalize timespec64 before timespec64_compare() Yu Liao

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=20211202130707.3910459-1-liaoyu15@huawei.com \
    --to=liaoyu15@huawei.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sboyd@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangxiongfeng2@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.