From nobody Mon Sep 15 11:54:26 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 4cQNjv2VNjz67Flp; Mon, 15 Sep 2025 11:54: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQNjt4sYYz43tG; Mon, 15 Sep 2025 11:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757937266; 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=R2Wrbt4yKQTsNx9wtj2Lw/HejWUqKWUb01+Y/AFJp5Y=; b=lQf+HBJjPsewydbrgxowZKaFzmhADMDpcIr8RopdS50friV2kqK/joY3JcpK9lWyJiOduD UNWdRnxCA+Hagwkq+UvKsW5/pd1DLMf0MPQIo0mxVcSjWO9uRBLBFBoIsEXEvegiJGfq8C f84njUiXdKG73lU0jJSN5ValI2Jc4t74vCv7kReAvKpms4hBclAnBtG68LRl2GH5ipqsbb 3t+sWNxJP7yW1+fxz30ejUluc4lGlAbZbtIqkJAZlWgcTwOD2S3l6i0eAfvPEBw4F7kkuo HREjfjAlw+PfHvkWh/buxPtOlCW/W7tsgOafIELeC/AJOFpur4u3oQsRSMjjPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757937266; 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=R2Wrbt4yKQTsNx9wtj2Lw/HejWUqKWUb01+Y/AFJp5Y=; b=tGV26pWrlWm8UlCfImfRIkGOTDXK9HgUjBg/wiNgKSWmGW39qiilKlZj/mcPZZq5+eafIe 6aGlnLG1Gl49bTkn56qm5ppgZhFWA2YETG5fbEkJqr78D+uK2tQZ6CpOK1A7KF+6XzTC2Y TOba+5lEO1E4I9qnoMq1P/9qnsyXblTdjX2eZmZFv9rOZ7XuYDdO+E5DkeIHtMPWUHW1SX yOraS5W5iiFuP4GszW32aEwkjLLjhAOEC8Hbi/EKpL6r2e6dPVzFca7jirxOPDy35O1dzw RkwJ1UTHzjvWk2wQBXtLWGEAPVjGzXshJoEt716apY3YK9luBO5Q5a663PoTkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757937266; a=rsa-sha256; cv=none; b=LuxXXOqHjO6jmJ3DkhZlvL6n5LOseQu//J5slwkeOUe0LmzjZKmKZtexVTTKn9aGVC4+9s +3Q/JmD+PCLbxrvkimhvYanQnwO8MhsrmOg9ZkQx26EQIeYBrboEwN6wqmaGHdOtE7WMp8 l4Wh8BrmftQ040T8AHGhPO9/yYKe3pA3219MeUCTrQQL2uTN2xUFZEmUzItHGjoM6sJxnk Qm2sjXliH1AVY++9TVFMm48XD1LBZMpd70nKrXp5Rj6TFngqBpAZVlHeXUhwEBSeu4Af7s 7yEuB6O2zYOwq4RkAPgac1Uywu9DPa62xi1zPkHZxiKsVVH/vWTy74TjBlvBfA== 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 4cQNjt3dHZztGS; Mon, 15 Sep 2025 11:54:26 +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 58FBsQb0025478; Mon, 15 Sep 2025 11:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FBsQAg025475; Mon, 15 Sep 2025 11:54:26 GMT (envelope-from git) Date: Mon, 15 Sep 2025 11:54:26 GMT Message-Id: <202509151154.58FBsQAg025475@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: 2c42aecee696 - main - pfctl: ctime(3) and ctime_r(3) can fail when timestamps are way off. 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: 2c42aecee69696aba85f1ad4c45033dd2db86b02 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c42aecee69696aba85f1ad4c45033dd2db86b02 commit 2c42aecee69696aba85f1ad4c45033dd2db86b02 Author: Kristof Provost AuthorDate: 2025-08-21 09:01:21 +0000 Commit: Kristof Provost CommitDate: 2025-09-15 09:32:35 +0000 pfctl: ctime(3) and ctime_r(3) can fail when timestamps are way off. Add missing error checks Input kettenis, millert OK millert Obtained from: OpenBSD, florian , a7b9eedcb4 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_table.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 0845f765a063..745ab84b3159 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -437,14 +437,19 @@ print_table(const struct pfr_table *ta, int verbose, int debug) int print_tstats(const struct pfr_tstats *ts, int debug) { - time_t time = ts->pfrts_tzero; - int dir, op; + time_t time = ts->pfrts_tzero; + int dir, op; + char *ct; if (!debug && !(ts->pfrts_flags & PFR_TFLAG_ACTIVE)) return (0); + ct = ctime(&time); print_table(&ts->pfrts_t, 1, debug); printf("\tAddresses: %d\n", ts->pfrts_cnt); - printf("\tCleared: %s", ctime(&time)); + if (ct) + printf("\tCleared: %s", ct); + else + printf("\tCleared: %lld\n", (long long)time); printf("\tReferences: [ Anchors: %-18d Rules: %-18d ]\n", ts->pfrts_refcnt[PFR_REFCNT_ANCHOR], ts->pfrts_refcnt[PFR_REFCNT_RULE]); @@ -543,12 +548,17 @@ nonzero_astats(struct pfr_astats *as) void print_astats(struct pfr_astats *as, int dns) { - time_t time = as->pfras_tzero; - int dir, op; + time_t time = as->pfras_tzero; + int dir, op; + char *ct; + ct = ctime(&time); print_addrx(&as->pfras_a, NULL, dns); - printf("\tCleared: %s", ctime(&time)); - if (as->pfras_a.pfra_fback == PFR_FB_NOCOUNT) + if (ct) + printf("\tCleared: %s", ct); + else + printf("\tCleared: %lld\n", (long long)time); + if (as->pfras_a.pfra_fback == PFR_FB_NOCOUNT) return; for (dir = 0; dir < PFR_DIR_MAX; dir++) for (op = 0; op < PFR_OP_ADDR_MAX; op++) @@ -653,8 +663,9 @@ pfctl_show_ifaces(const char *filter, int opts) void print_iface(struct pfi_kif *p, int opts) { - time_t tzero = p->pfik_tzero; - int i, af, dir, act; + time_t tzero = p->pfik_tzero; + int i, af, dir, act; + char *ct; printf("%s", p->pfik_name); if (opts & PF_OPT_VERBOSE) { @@ -665,7 +676,11 @@ print_iface(struct pfi_kif *p, int opts) if (!(opts & PF_OPT_VERBOSE2)) return; - printf("\tCleared: %s", ctime(&tzero)); + ct = ctime(&tzero); + if (ct) + printf("\tCleared: %s", ct); + else + printf("\tCleared: %lld\n", (long long)tzero); printf("\tReferences: %-18d\n", p->pfik_rulerefs); for (i = 0; i < 8; i++) { af = (i>>2) & 1;