summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch')
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch
new file mode 100644
index 0000000000..4b31718dea
--- /dev/null
+++ b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch
@@ -0,0 +1,47 @@
1From 183c8aeb601a02a38dd6815bcb651a7317b1b647 Mon Sep 17 00:00:00 2001
2From: Glenn Song <43005495+glennsong09@users.noreply.github.com>
3Date: Thu, 9 Oct 2025 07:51:49 -0500
4Subject: [PATCH] Fix CVE-2025-2153 (#5795)
5
6This PR fixes #5329. Previously, the message flags field was able to be modified such that a message that is not sharable according to the share_flags field in H5O_msg_class_t could be treated as sharable. A check has been added to make sure messages that are not sharable can't be modified so that they indicate they can be shared.
7
8The bug was first reproduced using the fuzzer and the POC file from #5329. With this change, the heap based buffer overflow no longer occurs.
9
10CVE: CVE-2025-2153
11Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/38954615fc079538aa45d48097625a6d76aceef0]
12
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 src/H5Ocache.c | 4 ++--
16 src/H5Omessage.c | 3 +++
17 2 files changed, 5 insertions(+), 2 deletions(-)
18
19diff --git a/src/H5Ocache.c b/src/H5Ocache.c
20index 87f321c..12c30cf 100644
21--- a/src/H5Ocache.c
22+++ b/src/H5Ocache.c
23@@ -1399,8 +1399,8 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
24 else {
25 /* Check for message of unshareable class marked as "shareable"
26 */
27- if ((flags & H5O_MSG_FLAG_SHAREABLE) && H5O_msg_class_g[id] &&
28- !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
29+ if (((flags & H5O_MSG_FLAG_SHARED) || (flags & H5O_MSG_FLAG_SHAREABLE)) &&
30+ H5O_msg_class_g[id] && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
31 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL,
32 "message of unshareable class flagged as shareable");
33
34diff --git a/src/H5Omessage.c b/src/H5Omessage.c
35index 7190e46..fb9006c 100644
36--- a/src/H5Omessage.c
37+++ b/src/H5Omessage.c
38@@ -354,6 +354,9 @@ H5O__msg_write_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, unsigned m
39 */
40 assert(!(mesg_flags & H5O_MSG_FLAG_DONTSHARE));
41
42+ /* Sanity check to see if the type is not sharable */
43+ assert(type->share_flags & H5O_SHARE_IS_SHARABLE);
44+
45 /* Remove the old message from the SOHM index */
46 /* (It would be more efficient to try to share the message first, then
47 * delete it (avoiding thrashing the index in the case the ref.