From nobody Tue Nov 17 17:07:27 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 4jTWPW3m3bz71SBC for ; Tue, 17 Nov 2026 17:07:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWPW2jkkz4LVD for ; Tue, 17 Nov 2026 17:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8IXIl+V7FNvhp+vDmas4ce0uif14HG1BEShWIDapDg=; b=iKABpY78pg/1tNlxvw7/aFPFlAtJMyrCb7GW+DVy9V2tOAvLuZgxydzmqH8QBih1XvdM9O 7SDtHNgPaCNwiEl52yuAXlBU9RKGKnmOu2fW1tZodSMmpY0k8DZyKJVbD8jjKkzSpxKZg5 ITkKd790TwCGGevtFWJLjHmiGSeE+guuuRT+FDALosQwnMA+SHAIm+6DIAqP50WdCT25UD K38wElsynFyK8Uwwd5+TEWpLYPOyFrufYd6UeBMzgwkqreJPp1oYAi0CKe2rL45/EFOwtt o4e0jmr/KAYVtju5V3maFGyptZ8PnrcNT1EiO7RPOHrD1wY/DfHqnSFND8j8aw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935247; b=oO83KO7gB2Cq2LmPst0txcHCfGHg2Tfe4T0owX5C/Rt5i4fdkH4CMKRS1Gd9aBe4OvF6Zh qtTqfaWCKUCXgBKIw7hIGn7jx2ZGPfbvn6V5a2mZbhJgahgzxoKccazenec2lZAJKWvGcD 66iwNPVEvJF/+09y2wAzXilA4E87bLiXzvddfwoyZ764jmiqsf7t9ZgX5gwnkFSJSKslea 3xZ9v3Rsgo6N733r2Yu5w+OSV1ZtMwHdjb1ClLJcKdOZYis23cbQTjXcY7nI2kZ04duAWh ce40PChipUs3evLsB3rd0Ynbb6mPTKANtJ8032ZJhWISJvdatFrxOtzW0Ya7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8IXIl+V7FNvhp+vDmas4ce0uif14HG1BEShWIDapDg=; b=h7qJj8MYbwXHcNhn4C7hnQZLTjtW/U4FhZ7QIq4FG9+zjHSA6bEtu7IG2vGZul1cM/axT/ L39epJ3xD1uhgd+kZQY8BxUcApZGB23GpUkXozKR8NDIMsNGALYK4cTqZe/g0TjmqHWgdd YVrJT5YqqAF7neE3F6W6T/efHrQFFMMYSgPKB8M7+3xOYLaM42jQWoTQTzGqO9NWj8m3LY GErjnBqhnO4+/15r7KhU1mTv8Fpfw1LtW5QhjsJTBIhuaIox7M7ulHabraaSIfxo/B1xAP M1nxCY07MOLzgG1p44JYtfDgJ2ESNodQMtUWLijO2zlintJ8mxT5hYWmTHTL4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWPW2MlZzrvW for ; Tue, 17 Nov 2026 17:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e33e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:07:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Mark Johnston Subject: git: 3e2a209fbc6b - releng/15.1 - watchdog: Fix a couple type issues List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3e2a209fbc6b0d25e7f685adfd0e9cbed5161097 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:07:27 +0000 Message-Id: <6afc89cf.1e33e.7c505452@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e2a209fbc6b0d25e7f685adfd0e9cbed5161097 commit 3e2a209fbc6b0d25e7f685adfd0e9cbed5161097 Author: Justin Hibbits AuthorDate: 2026-06-10 13:50:14 +0000 Commit: Mark Johnston CommitDate: 2026-11-09 15:02:29 +0000 watchdog: Fix a couple type issues * Force the type of the literal `1` passed to nstosbt() to ensure it's a 64-bit type (or larger). Otherwise it gets inconveniently typed to int, resulting in truncation. * Use `flsll()` when converting sbt to power-of-2-nanoseconds to fix 32-bit compatibility. Approved by: so Security: FreeBSD-EN-26:28.watchdog PR: 292616 Obtained from: Hewlett Packard Enterprise Fixes: 26d6617f3 ("watchdog: Convert to using sbintime_t format") (cherry picked from commit d08cb1dc17486920c1506f175d77259e0ac3f3a3) (cherry picked from commit ced89d9c04d450c1dad7fe5f21c1b2afca306046) --- sys/dev/watchdog/watchdog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c index e1b2e08c3f10..7f0b457b89d1 100644 --- a/sys/dev/watchdog/watchdog.c +++ b/sys/dev/watchdog/watchdog.c @@ -110,7 +110,7 @@ wdog_kern_pat(u_int utim) if (utim == WD_TO_NEVER) sbt = 0; else - sbt = nstosbt(1 << utim); + sbt = nstosbt(1ULL << utim); return (wdog_kern_pat_sbt(sbt)); } @@ -142,7 +142,7 @@ wdog_kern_pat_sbt(sbintime_t sbt) /* legacy uses power-of-2-nanoseconds time. */ if (sbt != 0) { - pow2ns = flsl(sbttons(sbt)); + pow2ns = flsll(sbttons(sbt)); } if (wd_last_sbt != sbt) { wd_last_u = pow2ns;