diff --git a/0035-Prevent-overflow-when-calculating-ulog-block-size.patch b/0035-Prevent-overflow-when-calculating-ulog-block-size.patch
new file mode 100644
index 0000000..3af66a7
--- /dev/null
+++ b/0035-Prevent-overflow-when-calculating-ulog-block-size.patch
@@ -0,0 +1,64 @@
+From 81e50cfb3b83a62d2a1e604a0854a9f346bdd6f9 Mon Sep 17 00:00:00 2001
+From: Zoltan Borbely <Zoltan.Borbely@morganstanley.com>
+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
+
+(cherry picked from commit 78ceba024b64d49612375be4a12d1c066b0bfbd0)
+---
+ 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 e9b95fce59..c805ebd988 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;
+     }
+-- 
+2.48.1
+
diff --git a/krb5.spec b/krb5.spec
index 46bc516..463d645 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -34,7 +34,7 @@
 #
 # baserelease is what we have standardized across Fedora and what
 # rpmdev-bumpspec knows how to handle.
-%global baserelease 5
+%global baserelease 6
 
 # This should be e.g. beta1 or %%nil
 %global pre_release %nil
@@ -117,6 +117,7 @@ Patch0031: 0031-Simplify-PKINIT-cert-representation.patch
 Patch0032: 0032-Support-PKCS11-EC-client-certs-in-PKINIT.patch
 Patch0033: 0033-Improve-PKCS11-error-reporting-in-PKINIT.patch
 Patch0034: 0034-Set-missing-mask-flags-for-kdb5_util-operations.patch
+Patch0035: 0035-Prevent-overflow-when-calculating-ulog-block-size.patch
 
 License: MIT
 URL: https://web.mit.edu/kerberos/www/
@@ -683,6 +684,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed Jan 29 2025 Julien Rische <jrische@redhat.com> - 1.21.1-6
+- Prevent overflow when calculating ulog block size (CVE-2025-24528)
+  Resolves: RHEL-76759
+
 * Fri Jan 17 2025 Julien Rische <jrische@redhat.com> - 1.21.1-5
 - Support PKCS11 EC client certs in PKINIT
   Resolves: RHEL-74374