From c9d2fcd650a88d76ae122646142245e5927a9165 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 3 Apr 2023 12:00:49 +0200
Subject: [PATCH] Release note for CVE-2023-28837 in 4.2.2

---
 CHANGELOG.txt          |  1 +
 docs/releases/4.2.2.md | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7a198c533c..52adc24ff5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -106,6 +106,7 @@ Changelog
 ~~~~~~~~~~~~~~~~~~
 
  * Fix: CVE-2023-28836 - Stored XSS attack via ModelAdmin views (Thibaud Colas)
+ * Fix: CVE-2023-28837 - Denial-of-service via memory exhaustion when uploading large files (Jake Howard)
  * Fix: Fix radio and checkbox elements shrinking when using a long label (Sage Abdullah)
  * Fix: Fix select elements expanding beyond their container when using a long option label (Sage Abdullah)
  * Fix: Fix timezone handling of `TemplateResponse`s for users with a custom timezone (Stefan Hammer, Sage Abdullah)
diff --git a/docs/releases/4.2.2.md b/docs/releases/4.2.2.md
index f9d70ed600..858b7c0bf2 100644
--- a/docs/releases/4.2.2.md
+++ b/docs/releases/4.2.2.md
@@ -17,6 +17,16 @@ This release addresses a stored cross-site scripting (XSS) vulnerability on Mode
 
 Many thanks to Thibaud Colas for reporting this issue. For further details, please see [the CVE-2023-28836 security advisory](https://github.com/wagtail/wagtail/security/advisories/GHSA-5286-f2rf-35c2).
 
+
+### CVE-2023-28837: Denial-of-service via memory exhaustion when uploading large files
+
+This release addresses a memory exhaustion bug in Wagtail's handling of uploaded images and documents. For both images and documents, files are loaded into memory during upload for additional processing. A user with access to upload images or documents through the Wagtail admin interface could upload a file so large that it results in a crash or denial of service.
+
+The vulnerability is not exploitable by an ordinary site visitor without access to the Wagtail admin. It can only be exploited by admin users with permission to upload images or documents.
+
+Many thanks to Jake Howard for reporting this issue. For further details, please see [the CVE-2023-28837 security advisory](https://github.com/wagtail/wagtail/security/advisories/GHSA-33pv-vcgh-jfg9).
+
+
 ### Bug fixes
 
 * Fix radio and checkbox elements shrinking when using a long label (Sage Abdullah)