From nobody Mon Nov 10 19:00:24 2025 X-Original-To: dev-commits-src-branches@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 4d4zWX2bBdz63GVx; Mon, 10 Nov 2025 19:00:24 +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 4d4zWX1Yvpz3LmP; Mon, 10 Nov 2025 19:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801224; 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=YLQLZ3/BP2hOubI124SAfYpZMSqYbTgW0LGeJlukPXw=; b=kznqx5T5SA4v5QFKUtcOUXeWapiPHVnWMJ549olwc3KGovUSxEip8ZRjf8rtwc+cOEM+pf 0MW8HpRGatAvHazudeDEy+7gifPLpBV520TDloBtqC4QH50Qu2w18/lruAWEg+NBHFkm1V Mj16QqqI4pUpqJEqksaEcgwyl7LePsenYd5PUq9FtJprg1MN9imKzuJrq8ZQBAfaoL5/xs AwFosEF5Bg6u2bcVNXtO0v+WOOvl1EvkGyNxukXKqe1WET/572j047V+vkpOagLFEKq2CE s2qP227bW6Qepd9tPPwF6qsS+B74YM7x0TuTUEPrpP9Q9VCk4Z4F2lA9tM2fpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801224; 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=YLQLZ3/BP2hOubI124SAfYpZMSqYbTgW0LGeJlukPXw=; b=SebPL+m6ftcFjpr1x+HA9Rd0tL8ISQmOurSQzPixcOsuF/cmIWlW8clOF6Xta7DiTWPwFm C97nmV++5Q7GIOKYvN0zNMPr0v8ELOU8JtTj5CH2v3ZDkNEYTKMxtS/f1bpDOpEG0d0ROf TMAmwTCmWWTogRvye45E1Gv0Au1KGSPXxzIADbxDQlrPjFhBIsi9hPz8TV70uUGBAeuA24 /uT8pD+x6eU+xtweEGeEj6BLyrIu9+wYnl3jPCh17pgUEJwA7RoJQitUN4eC0C3d37to9e adUIAhNzvCXCjZcOF4UJSytsvS/BqRktX/VQgrAPM2Gw0ZSMoISPCHWBd25ZBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762801224; a=rsa-sha256; cv=none; b=IbnHTqOo5vaeF9prGvwEU30sSKroaWCTykToOwfGqMWwJxloHEuEK7xbOsZHbrh1LSofVR xozG/t4v2eg91WU0NPUdJmMaPjgRlk78Bdq9X46ua1AjZT0+GS3WVZ9aqMNjcmd2tvwwNU cZCLou9JjMDD+eo4BlCDrjntJjDHI6s4FRE/CbgXPevgaa+4c+Sssg8w4cbhYmbeSmfGeq 7z3WsHNUC2XmVSLMtn7Na81c+9T+qP+1HDNXW9VYgJUubvj4MT4dWp83NOxIjTjZR0AnWh 020gyHEWzpagyAPlwrC6j5ieN1815i7yHGyDWuWKzaqlwnBJSDz6ZV6k66hY2w== 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 4d4zWX0tpNzVV3; Mon, 10 Nov 2025 19:00:24 +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 5AAJ0Orx005047; Mon, 10 Nov 2025 19:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJ0O6L005043; Mon, 10 Nov 2025 19:00:24 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:00:24 GMT Message-Id: <202511101900.5AAJ0O6L005043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: dd1ed088f090 - releng/15.0 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: dd1ed088f090ded90a60a47b1eb5dfbacc1e158a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dd1ed088f090ded90a60a47b1eb5dfbacc1e158a commit dd1ed088f090ded90a60a47b1eb5dfbacc1e158a Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-10 19:00:10 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Approved by: re (cperciva) 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 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); } /*