mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Yan <wangyan01@kylinos.cn>
To: John Stultz <jstultz@google.com>, Thomas Gleixner <tglx@kernel.org>
Cc: Stephen Boyd <sboyd@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org, Wang Yan <wangyan01@kylinos.cn>
Subject: [PATCH] time: Fix off-by-one in compat settimeofday() usec validation
Date: Mon, 22 Jun 2026 18:33:48 +0800	[thread overview]
Message-ID: <20260622103348.120255-1-wangyan01@kylinos.cn> (raw)

The compat version of settimeofday() uses '>' instead of '>=' when
validating tv_usec against USEC_PER_SEC, allowing the value 1000000
to pass the check. After the subsequent conversion to nanoseconds
(tv_nsec *= NSEC_PER_USEC), this results in tv_nsec == NSEC_PER_SEC,
which violates the timespec invariant that tv_nsec must be strictly
less than NSEC_PER_SEC.

The native settimeofday() was already fixed in commit ce4abda5e126
("time: Fix off-by-one in settimeofday() usec validation"), but the
compat counterpart was missed.

Fix it by using '>=' to reject tv_usec values outside the valid
range [0, USEC_PER_SEC - 1].

Fixes: 5e0fb1b57bea ("y2038: time: avoid timespec usage in settimeofday()")
Signed-off-by: Wang Yan <wangyan01@kylinos.cn>
---
 kernel/time/time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 771cef87ad3b..0dd63a91e7c5 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -251,7 +251,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv,
 		    get_user(new_ts.tv_nsec, &tv->tv_usec))
 			return -EFAULT;
 
-		if (new_ts.tv_nsec > USEC_PER_SEC || new_ts.tv_nsec < 0)
+		if (new_ts.tv_nsec >= USEC_PER_SEC || new_ts.tv_nsec < 0)
 			return -EINVAL;
 
 		new_ts.tv_nsec *= NSEC_PER_USEC;
-- 
2.25.1


             reply	other threads:[~2026-06-22 10:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-22 10:33 Wang Yan [this message]
2026-06-22 11:01 ` Arnd Bergmann
2026-06-22 11:23 ` [tip: timers/urgent] " tip-bot2 for Wang Yan

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=20260622103348.120255-1-wangyan01@kylinos.cn \
    --to=wangyan01@kylinos.cn \
    --cc=arnd@arndb.de \
    --cc=jstultz@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sboyd@kernel.org \
    --cc=tglx@kernel.org \
    /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

Powered by JetHome