From nobody Wed Nov 05 16:33:52 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 4d1rVm4x87z6GZhW; Wed, 05 Nov 2025 16:33:52 +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 4d1rVm4SfTz3XZx; Wed, 05 Nov 2025 16:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360432; 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=Aie8lhyLiZlRDFVqU0/2rXmh+aPW2Vfv/ygWwCJCkZE=; b=bO3ll4tRKtakQQ7Myzlv32tn1BniNwF3fStpGKNUME8QHYlJqYAG5BRDdp4zGbSkARHblz tl6q+dwyA/nyhGGz/9LzBby7eQcqicqOn8yL+ulljJwwdhFpApNm4oGbAkfL9PtjWhhz8I fvPWCHdZIiK8Blm3eQQuylMVyZPe1E+bPKniEnv85exSVzRyn073Am+VtBBwxLbNWdi/at liuJA0KVyfx5Y9/LjQlX+TscjHPb6bJl3cbAqVoqm5yl95QBqGzm1HUJxYaTUZCXLptZn0 mWmiMppiJdpzT59qFTmL8lojO7dXzT8nFkMMviV5Cr2diKPQO//j0vPqKtjQuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360432; 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=Aie8lhyLiZlRDFVqU0/2rXmh+aPW2Vfv/ygWwCJCkZE=; b=vhDs8TVKvgQdaUtEGjzt2WROSi79rWCttcjXoRomtt1TU7u6gWRiC39fqM4BODgdCx8ce3 718LbUCZzu2+NxOrMD4ZoDoVDVM3lu4bMUu51R9h7jUeVfYmXMcYAqwPnkWAFDTT6tbdwW MB/YuGEdtT+XMm1dbihzgZSmCj+1Itsv0QculKJFbexGkAkgnwKdTpQgKjdRa5YtqMM97U eU0dLwLOcZqW2lkuweDX78V4FyV9Urq6e4NOZ3lkRc4vS65BZTyxkuYpnJsa8CvZrIi3B2 TV/2gGchOKS97wUcFMGVu2rIrx/7VCe1XqYh6b+ojGx0ndfEdo2xy38WcnFL5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762360432; a=rsa-sha256; cv=none; b=RY+qDfWwGOdPQklVzLNXQvBWQjV0ehu6HL9KVH5Hj+MZoSetLFXL7Xou02ujieMTSusnX4 IJR22Eg8uauBhAD2CIbQsD6827MrcOeNtOpj7hBJZuDEh/+1CjXsDR76NtPVfCjI1GrrsN RG2rvjc8HKHQ/xm2Q5NRrt+bu4Q7r+XYYKOFB9282QcXX1GgJL+JmrXPsk7Kz+uteA9TFY h7sQrO5tVNrSlm98WQQuoZPMwTBaNjtxBCnKqC9C/K2LZW0VW/SnALNtEgVX9GvjXl+mQP z8rNa5oezDXS+aoERxNkFCAhQURgZGIDHD122PAUTP+Rqiqa5SHDWQKe6rHBgA== 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 4d1rVm40RRzs1b; Wed, 05 Nov 2025 16:33:52 +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 5A5GXqJS047587; Wed, 5 Nov 2025 16:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5GXqKZ047584; Wed, 5 Nov 2025 16:33:52 GMT (envelope-from git) Date: Wed, 5 Nov 2025 16:33:52 GMT Message-Id: <202511051633.5A5GXqKZ047584@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: 0a45aa9e954a - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 0a45aa9e954acc75484d59ad42ee440aa7f034c7 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a45aa9e954acc75484d59ad42ee440aa7f034c7 commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7 Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste CommitDate: 2025-11-05 16:33: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) --- 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 dd0bd032ae3c..1ed71646ebe4 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2535,8 +2535,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); } /*