From nobody Wed Feb 12 09:38:45 2025 X-Original-To: dev-commits-src-main@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 4YtCtZ0Ksdz5mTF2; Wed, 12 Feb 2025 09:38:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtCtY4Gh7z3Tqd; Wed, 12 Feb 2025 09:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739353125; 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=2WeuzCZcdkfGgmM0hgokFU7QcL6u+rjevqmNvSdIW78=; b=jNYMHPtSxS4fx45bgWpobZb8i3BhmstvVZ7noZyzAVNjbhok5qD/VorVIy4KiqDNNFrCK7 vIX4LIC3Bu4f5MRQzAQ+v7MFTA9mEcxAPC737HDUuGMyRP+YYodX2w0/06nQZUDPDbyGt8 gWLXzLqC4s8smSI9431zkqL60LZ/bXMSg9pclvlyPH5W90LiA7Gh+jJnWAyH9nhBV1Uj4I 6m8sLw9fT0BeMOHd2wnD5bF50yeh4pZR1KylWUqQhTGa+qUe527IcZ8pPj/sNZBvdqjeFY GjSUWsLWq/IdgiITQYutxPLcCj3XkgVXuALtjsjKr5WEB3E7ZQor2jLOEVi+jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739353125; 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=2WeuzCZcdkfGgmM0hgokFU7QcL6u+rjevqmNvSdIW78=; b=aKY4RsSevYhTk3vOdURF6oKYGW7xJM9uAwh9hu4wV0gSNEmLB1xXISKdPjHqYocPUgoe2k URDDqyGPboGbh7rpMfiUGPGnyxtOuK7ltwkGZl32RaZK343RMSmXkVatpj12eHN2ZiNnsP rpS4JGzqK/Jy9fePjrUxJsC1cQnXsgRN6OOp5ed4b/N2Rff+I6Or+zjOi+xtaUZ2N/N2fQ yHmgAp7I49u44i+145GGhzvEeiQY3VInvkq9cVl+cWD53LJfRWWq2un14ytl/ffBKuuN+I hmMRRfQGENoK1aBkHvvot6Uo4qMdZGQWitw5SURGrkZHayODSZx7wJ/Bc1HnlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739353125; a=rsa-sha256; cv=none; b=E8dRzVZ1wSiv+CWSxa2jp/wn1avfkMJhJQijfRu2W01exE/vuWCMFT14KXjADzF4O5BpvW 0xR9gyTNRwPKg8rfXRKROaFfMdtiOeKZwt8DddVemEfr8rlFN/fnTjTaYwPbT4Qt93M7OJ Gg1sutnCBV13ypNb4n7iPyL/yGowzTSxo1hS87bB1pMkr47Ss97pBNSWuAg2X1jha3xUWj tUq4onGtv818qwTvhj9HUQaf9ZdswCHqb87voHEy8IA787a8GS6R+EKO6rFabLFTHD4MTc MPP+Q4uCDtBSXxOc20oVBqvdIQRp78h4hhlwTQey63mo/w1wfgCbkuiVPNVQ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtCtY3pgdzsyh; Wed, 12 Feb 2025 09:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C9cjXe037438; Wed, 12 Feb 2025 09:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C9cjII037435; Wed, 12 Feb 2025 09:38:45 GMT (envelope-from git) Date: Wed, 12 Feb 2025 09:38:45 GMT Message-Id: <202502120938.51C9cjII037435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 21bc7eec2b70 - main - pfctl: avoid truncating a time_t division into days List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21bc7eec2b7051025f100ce988bab79c2c172bc0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=21bc7eec2b7051025f100ce988bab79c2c172bc0 commit 21bc7eec2b7051025f100ce988bab79c2c172bc0 Author: Kristof Provost AuthorDate: 2025-02-05 12:49:18 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 08:29:09 +0000 pfctl: avoid truncating a time_t division into days Obtained from: OpenBSD, deraadt , b14a9e0815 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 7a1339ad273a..f567cc78dd23 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -513,7 +513,8 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts) running = s->running ? "Enabled" : "Disabled"; if (s->since) { - unsigned int sec, min, hrs, day = runtime; + unsigned int sec, min, hrs; + time_t day = runtime; sec = day % 60; day /= 60; @@ -522,8 +523,8 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts) hrs = day % 24; day /= 24; snprintf(statline, sizeof(statline), - "Status: %s for %u days %.2u:%.2u:%.2u", - running, day, hrs, min, sec); + "Status: %s for %lld days %.2u:%.2u:%.2u", + running, (long long)day, hrs, min, sec); } else snprintf(statline, sizeof(statline), "Status: %s", running); printf("%-44s", statline);