git: dd1ed088f090 - releng/15.0 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Nov 2025 19:00:24 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=dd1ed088f090ded90a60a47b1eb5dfbacc1e158a
commit dd1ed088f090ded90a60a47b1eb5dfbacc1e158a
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-10-31 17:04:51 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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);
}
/*