From nobody Fri Apr 3 15:27:28 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 4fnMzN5Gskz6Ygbw for ; Fri, 03 Apr 2026 15:27:28 +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 4fnMzN2mZ1z3hLd for ; Fri, 03 Apr 2026 15:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775230048; 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=xFUVm0AAqbJpr9CzWlJ6GgQOjRFcFyTze9nM6lttpc8=; b=fNAxLcmlh7/H11OLm3+tXmd7kfPRmztvQrYdEZwGdXJv6X+qsP67MSkOSeVMU6Kdj2PRmm kcQekmkNUtEDrPZRt6E9oyhEylrcLIJPDYXt8Vy+13LZzcQ+jSNA4yPl7K9i6NG54ekBOX oeP0GiEPrMdEVSCl2xnN/a4JVhPcP6vCqmzYgNTZ+wr9tQ0b4jSy8fSjJ0ueDV43vfhN2D RFuLIiznPM5/UDIdZMsCGpX6x00SeFCMY4HU1JNWF2W6qa0DPazmG1E9T54zTx+xY0zrdc POwUQ3pH7fo20cO05Vy6nEtw+PMlzI9obqy+GUp/xSfSgiNALOWb4wVvPlWeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775230048; a=rsa-sha256; cv=none; b=sGFZCEfYzgUTOg8N9IBvTRMC8cecEa4xFSzO7kClZfivXrNiFhcWH/3d1LPJCMgzB5saWF xa5tfTz2boU7ly0ZUYxFkmKDk/oTrDF9tDfLa+mAX2AkJKJbGBAI955MBfKQHfWBbUojcg N2lANGVP+io5pFYEA+NM44bFLnAqJMKvn7b1PutUdHM/9MhtqFdee6vhvjki3n6x6RzHfp TJhZzaL9lk/lsrP9rq+YsKfNqd/+cJmyGlhuc/jfQXLkW+S1Y+dktqv5/JEK61kxwcqFct 8G/URLI9MtwgqXsWg1uS4iEcfV8e1hiN5JxL754qpcgY4BrqvN5WeKLt8OGw8Q== 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=1775230048; 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=xFUVm0AAqbJpr9CzWlJ6GgQOjRFcFyTze9nM6lttpc8=; b=pJm+rsBCrXPRbOpbbJp3xA1VhoDbl/64Lq4ffNTQszZjl8huokQDWj3y0PZInLbQr2SEVJ 7kqVM4Qft/n05MjyVwmoJGIWIdEqn4vNYh8x98X2PkcEmAGDg2iZFJO2mRxjxQQ13iQ25F wxZGHgxLBglCNT5DG7h4FXs5ESVng//VGuGb9pAT6ql5p7EBX+xaPBxBvdOmOezuM8VgRZ 5OeqpzhB1aYX9ej+ejla9h0/6UQXH1nTMyqPO35tMUHzpGKZh6D8Zl93lMr1F5g+6APMQc iLtXsFU3kvoPJAwJNoa8GDbL5zH7mtRWsiIOugFu5o5IiYPxmjAzL08Ul623lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnMzN2HdJztrh for ; Fri, 03 Apr 2026 15:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 406ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 15:27:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jake Freeland Subject: git: db0096d573d1 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: db0096d573d1c7972960aafb1657a338f2e971e5 Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 15:27:28 +0000 Message-Id: <69cfdc60.406ab.4597b987@gitrepo.freebsd.org> The branch stable/14 has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=db0096d573d1c7972960aafb1657a338f2e971e5 commit db0096d573d1c7972960aafb1657a338f2e971e5 Author: Jake Freeland AuthorDate: 2026-03-20 06:33:38 +0000 Commit: Jake Freeland CommitDate: 2026-04-03 15:26:56 +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);