diff --git a/0020-fix-CVE-2025-24528.patch b/0020-fix-CVE-2025-24528.patch new file mode 100644 index 0000000000000000000000000000000000000000..0fd22dd11c897bbaaa943fa2cda8397618ae4213 --- /dev/null +++ b/0020-fix-CVE-2025-24528.patch @@ -0,0 +1,59 @@ +From 78ceba024b64d49612375be4a12d1c066b0bfbd0 Mon Sep 17 00:00:00 2001 +From: Zoltan Borbely +Date: Tue, 28 Jan 2025 16:39:25 -0500 +Subject: [PATCH] Prevent overflow when calculating ulog block size + +In kdb_log.c:resize(), log an error and fail if the update size is +larger than the largest possible block size (2^16-1). + +CVE-2025-24528: + +In MIT krb5 release 1.7 and later with incremental propagation +enabled, an authenticated attacker can cause kadmind to write beyond +the end of the mapped region for the iprop log file, likely causing a +process crash. + +[ghudson@mit.edu: edited commit message and added CVE description] + +ticket: 9159 (new) +tags: pullup +target_version: 1.21-next +--- + src/lib/kdb/kdb_log.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c +index 2659a250187..68fae919a52 100644 +--- a/src/lib/kdb/kdb_log.c ++++ b/src/lib/kdb/kdb_log.c +@@ -183,7 +183,7 @@ extend_file_to(int fd, unsigned int new_size) + */ + static krb5_error_code + resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd, +- unsigned int recsize) ++ unsigned int recsize, const kdb_incr_update_t *upd) + { + unsigned int new_block, new_size; + +@@ -195,6 +195,12 @@ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd, + new_block *= ULOG_BLOCK; + new_size += ulogentries * new_block; + ++ if (new_block > UINT16_MAX) { ++ syslog(LOG_ERR, _("ulog overflow caused by principal %.*s"), ++ upd->kdb_princ_name.utf8str_t_len, ++ upd->kdb_princ_name.utf8str_t_val); ++ return KRB5_LOG_ERROR; ++ } + if (new_size > MAXLOGLEN) + return KRB5_LOG_ERROR; + +@@ -291,7 +297,7 @@ store_update(kdb_log_context *log_ctx, kdb_incr_update_t *upd) + recsize = sizeof(kdb_ent_header_t) + upd_size; + + if (recsize > ulog->kdb_block) { +- retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize); ++ retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize, upd); + if (retval) + return retval; + } diff --git a/krb5.spec b/krb5.spec index 318a1e52079dbefef1f3d943353c2615085fe16c..c2102202332fd2f745809d28e0e06afcaf2d4110 100644 --- a/krb5.spec +++ b/krb5.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 # Set this so that find-lang.sh will recognize the .po files. %global gettext_domain mit-krb5 @@ -48,6 +48,8 @@ Patch17: 0017-fix-CVE-2024-26462.patch Patch18: 0018-fix-CVE-2024-26461-CVE-2024-26458.patch #https://github.com/krb5/krb5/commit/55fbf435edbe2e92dd8101669b1ce7144bc96fef Patch19: 0019-fix-cve-2024-37370-and-cve-2024-37371.patch +# https://github.com/krb5/krb5/commit/78ceba024b64d49612375be4a12d1c066b0bfbd0 +Patch20: 0020-fix-CVE-2025-24528.patch License: MIT URL: https://web.mit.edu/kerberos/www/ @@ -683,6 +685,9 @@ exit 0 %{_datarootdir}/%{name}-tests/ %changelog +* Thu Aug 14 2025 Bo Ren - 1.21.2-5 +- fix CVE-2025-24528 + * Tue Jan 14 2025 yangxinyu - 1.21.2-4 - fix CVE-2024-37370 CVE-2024-37371