From nobody Fri Apr 3 15:26:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fnMy11HX9z6Ygb1 for ; Fri, 03 Apr 2026 15:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fnMy06fr5z3f7g for ; Fri, 03 Apr 2026 15:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775229977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lfll+vcCVBaJwKftBgbGdtS8jCYgXd4hwHpBLiqOnU=; b=Pb+WSQw8lMcJNlcTpDc8uSQOweCOunX7Y8SdoM5LrZHeFtS4tEzJEyom7v/rkCVOm2LS9S LVFY4esqgE0NIVabNG1bVa371L1twfApXeTgWJ7g/BpfAlaqtp6mcWlmi1mBNrIh0JVDQo 4YiK0/t2AXoPuskgaGPDYOwf5f8Ewj1hBehTtJBmuifebBFwCk+VDRVNQ43JeMvYY7Ndu0 YaNqLOGlMlBQ4K7dOmE0OZhJ2TNN1TaTn1EhNmvbem48LOU9fcTfB2/wa+hBytS2rZRJFv ePm5xSNMDtllT1tUdkrEYkl6g9s1oyT2hmPQ4sOKlqPTQPbYmIPBxPyCl8Z1VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775229977; a=rsa-sha256; cv=none; b=HtkdYaeyJza7hirx0pCCjcc+1zX13QZgBMRlPE4DDokLEndoLsMxnufMk5dLlLMiYiAYWN KZnFgctwRmwtJPY7h+orhICq/EvqSsGcoVVdMyCOESMOXR9OpJd8/ynGRh9leYyeu1Gucd Y32Dog53T24hH2qiZXodvrZp9H0L02Cb6BymX7T02LmTimeaW70gudd/U+Oso5c0OhKF7i gV2MCH1oCo+VVpeDgvkjx3mvSg8G3+BBstCulHcx2XBJCGRFEP7R26G0d9NC4O/er/fsdE /60b0mQBlUVjr0hzaGN6Xq7xNztOBFowxyaufWWMBiisiW+z/lBd+DHiukM/Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775229977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lfll+vcCVBaJwKftBgbGdtS8jCYgXd4hwHpBLiqOnU=; b=IJmwRnZcacTiaZdb7Z5opBohrXRzNGuenBUA3MDtUFV5w2cDtFPryhA6jHQcPa+LFdyA/c TJgKKuJApmvpW1bjWcQ05AdNgngPu60orv3d6tK/6s9NE/orevXs13foNd/AY/si5Woyvc xefnl8Paho+W3OvSDGRJqIktabJLYS53zIOwEh7cEndkmh+nEq+j0OX+gTKFJjv7LlkMnL mFvNGpA8lTyWxv5IuIX33I2xmGgCLEhP6GCbuWHdG6l1jggrw0eS8o1wrSCu9QDseThEwO WpaI4HK0UHs+fwcg+MWInrK8YKsh+HebAbe5FOU0hNdImBVDA4bF2TfqMs52Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnMy06GBCzv1N for ; Fri, 03 Apr 2026 15:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40dbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 15:26:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jake Freeland Subject: git: 53c01df929c1 - stable/15 - timerfd: Use saturating sbintime conversions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 53c01df929c12ad7d4995d1f5dc6769ae06af915 Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 15:26:16 +0000 Message-Id: <69cfdc18.40dbf.3d9f47e8@gitrepo.freebsd.org> The branch stable/15 has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=53c01df929c12ad7d4995d1f5dc6769ae06af915 commit 53c01df929c12ad7d4995d1f5dc6769ae06af915 Author: Jake Freeland AuthorDate: 2026-03-20 06:33:38 +0000 Commit: Jake Freeland CommitDate: 2026-04-03 15:25:36 +0000 timerfd: Use saturating sbintime conversions Some timerfd consumers set expirations with timespec tv_sec components larger than 2^31 - 1. In such cases, converting that timespec to sbintime results in data loss or sign flip, yielding a shorter expiration than desired. To avoid this problem, use saturating timespec-to-sbintime conversion functions. These will clamp the converted sbintime to SBT_MAX under circumstances where the normal conversion functions would overflow. Saturating conversions still result in data loss, but the consequences are less severe, causing problems only after SBT_MAX (~68 years) of system uptime elapses. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55792 MFC after: 2 weeks (cherry picked from commit 0e8f351be7935729bf67dc1b7aa4d178cf154931) --- sys/kern/sys_timerfd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 236dfe8bb96a..f2a66e21cd63 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -165,7 +165,7 @@ timerfd_jumped(void) &diff, &tfd->tfd_time.it_value); if (callout_stop(&tfd->tfd_callout) == 1) { callout_schedule_sbt(&tfd->tfd_callout, - tstosbt(tfd->tfd_time.it_value), + tstosbt_sat(tfd->tfd_time.it_value), 0, C_ABSOLUTE); } } @@ -398,10 +398,10 @@ timerfd_expire(void *arg) ++tfd->tfd_count; tfd->tfd_expired = true; if (timespecisset(&tfd->tfd_time.it_interval)) { - exp = tstosbt(tfd->tfd_time.it_value); - interval = tstosbt(tfd->tfd_time.it_interval); + exp = tstosbt_sat(tfd->tfd_time.it_value); + interval = tstosbt_sat(tfd->tfd_time.it_interval); now = sbinuptime(); - next = now + interval; + next = now > SBT_MAX - interval ? SBT_MAX : now + interval; /* Count missed events. */ if (now > exp) { @@ -553,7 +553,7 @@ kern_timerfd_settime(struct thread *td, int fd, int flags, &tfd->tfd_time.it_value); } callout_reset_sbt(&tfd->tfd_callout, - tstosbt(tfd->tfd_time.it_value), + tstosbt_sat(tfd->tfd_time.it_value), 0, timerfd_expire, tfd, C_ABSOLUTE); } else { callout_stop(&tfd->tfd_callout);