From nobody Wed Nov 05 16:34:26 2025 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 4d1rWR1d6Fz6Gb2b; Wed, 05 Nov 2025 16:34: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 4d1rWR0vTyz3Xfb; Wed, 05 Nov 2025 16:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360467; 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=t2ORV7GeUAg133nLuemKxDb+dHUNorUaiJ+k5XBahcg=; b=DAnn1N61G9X+WEWgccM/846XEqupczgqil1fOlp+QoiV0NHsQzuIkaVpeRf+stf089t/0t CpRH69vBwgTE3NBqrWz9ri8jYLjs/I5MVu0NBI+KUodAhev8DD+hFD+T2qXe/UAKE4KayQ 2XZ2N5124pV+T/CGZ9CWyy0U0B0A2u+Pr65wxno7KD32CnAiY/WkSmM0GXOdNk1Fa/9VOX EenfH3mytO4GUmf9S78p71qveLOZRyQl8/lCA73TSHJgdMjP+Q6vqPDnJ/ikxFvzC75P4I giUM/+keEs1vPrBEewR1cLDFEBFYnqcaxGjCnnfK5Kh1ccHpBkO+15HGXZAx7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360467; 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=t2ORV7GeUAg133nLuemKxDb+dHUNorUaiJ+k5XBahcg=; b=Hmrm8I/By4Rj4UR3k0VqIjRjc3ZeLrNeEEDwSz3SdQfxxJ+TsRZWO0T54KeY2T9vKwGM76 e2zhmlQC5IN/+/whqr6fDx0QV83AAt5hwJnmeAAvnyG26v6NIA72M+egiZZ7jWTFcLuMNx nVJFB/mghgCLmcr51A4ladddcTObfi767IqIRo+81+eRBiWvOJKCVM1vYLelB6hDsskT+e PyDNqe4BABMZK+ogQ7hDTou/e7wOxT+5DxK7/TWavvrXwF/wAQgF8oI37r4Y3ctn0vMDAW mjqNLxlVbGa9+7ZYts4faqllnEV1Ft8TLfe0+ltxlGtxK0exZXgLVjbJr+ywwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762360467; a=rsa-sha256; cv=none; b=G2x8up29Rga/uMyH5kZcy6rcbKNl5ANCT47Q4iPm9ukLg/6HiMfHpXkcN+rTvzUj8qbjfH y1OYtvmNcosVMISp9XqAnSYMpt0FgP4jcQ8Wyart+WLQBTVNU8n+Zx6zHEnHhZ1HohjASa j31fLR7lRJsAx2pYXcGmT4ACRJuskPvTpsTllyazeWohX+/c7j56iWfZv1MWesSnJ7K/bR 6PnFTEEpz69rajRgq6lbl8153ULq3QDDD6kToq7fH2EOWaM8eGuDjDqNzEXWXzXhKS6QY+ v7kTWWKcpqRUiqbfLrdI1eyPkT22yd0dDNeGSnHNgVl1eymjE2C5U40B/EETAQ== 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 4d1rWR0N6vzrvt; Wed, 05 Nov 2025 16:34:27 +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 5A5GYQ9o047872; Wed, 5 Nov 2025 16:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5GYQl6047869; Wed, 5 Nov 2025 16:34:26 GMT (envelope-from git) Date: Wed, 5 Nov 2025 16:34:26 GMT Message-Id: <202511051634.5A5GYQl6047869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4fbf901a2925 - stable/14 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4fbf901a2925ec2598167c1c4f04e78c06960869 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4fbf901a2925ec2598167c1c4f04e78c06960869 commit 4fbf901a2925ec2598167c1c4f04e78c06960869 Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste CommitDate: 2025-11-05 16:34:06 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation (cherry picked from commit ce03706ab26c5770150f1ef96aca36b69baa535f) (cherry picked from commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7) --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 1b4b55c5034d..e129218cdd5c 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2534,8 +2534,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /*