summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-10-10 11:40:30 -0400
committerPatrick Cloke <patrickc@matrix.org>2023-10-10 11:40:30 -0400
commitb6cb610d50cd1a58e86f602b510bf723d3f79466 (patch)
treebd7ab023b4fa5e599c12d103ff6f8f71b79a97b2
parentMerge branch 'master' into develop (diff)
parentAdd CVE number for advisory GHSA-5chr-wjw5-3gq4. (diff)
downloadsynapse-b6cb610d50cd1a58e86f602b510bf723d3f79466.tar.xz
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--CHANGES.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 0ee3970e2b..6f42ebba93 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,7 +7,7 @@ However, please take note of the security advisory that follows.
 
 The following issue is fixed in 1.94.0 (and RC).
 
-- [GHSA-5chr-wjw5-3gq4](https://github.com/matrix-org/synapse/security/advisories/GHSA-5chr-wjw5-3gq4) — Moderate Severity
+- [GHSA-5chr-wjw5-3gq4](https://github.com/matrix-org/synapse/security/advisories/GHSA-5chr-wjw5-3gq4) / [CVE-2023-45129](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-45129) — Moderate Severity
 
   A malicious server ACL event can impact performance temporarily or permanently leading to a persistent denial of service.