6eaa34fe07
- Resolves: CVE-2024-45779 CVE-2024-45778 CVE-2025-1118 - Resolves: CVE-2025-0677 CVE-2024-45782 CVE-2025-0690 - Resolves: CVE-2024-45783 CVE-2025-0624 CVE-2024-45776 - Resolves: CVE-2025-0622 CVE-2024-45774 CVE-2024-45775 - Resolves: CVE-2024-45781 CVE-2024-45780 - Resolves: #RHEL-79700 - Resolves: #RHEL-79341 - Resolves: #RHEL-79875 - Resolves: #RHEL-79849 - Resolves: #RHEL-79707 - Resolves: #RHEL-79857 - Resolves: #RHEL-79709 - Resolves: #RHEL-79846 - Resolves: #RHEL-75737 - Resolves: #RHEL-79713 - Resolves: #RHEL-73785 - Resolves: #RHEL-73787 - Resolves: #RHEL-79704 - Resolves: #RHEL-79702 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Lidong Chen <lidong.chen@oracle.com>
|
|
Date: Tue, 21 Jan 2025 19:02:37 +0000
|
|
Subject: [PATCH] fs: Prevent overflows when allocating memory for arrays
|
|
|
|
Use grub_calloc() when allocating memory for arrays to ensure proper
|
|
overflow checks are in place.
|
|
|
|
The HFS+ and squash4 security vulnerabilities were reported by
|
|
Jonathan Bar Or <jonathanbaror@gmail.com>.
|
|
|
|
Fixes: CVE-2025-0678
|
|
Fixes: CVE-2025-1125
|
|
|
|
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/fs/btrfs.c | 4 ++--
|
|
grub-core/fs/hfspluscomp.c | 9 +++++++--
|
|
grub-core/fs/squash4.c | 8 ++++----
|
|
3 files changed, 13 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
|
index 0d45f09d3..4a4a8f243 100644
|
|
--- a/grub-core/fs/btrfs.c
|
|
+++ b/grub-core/fs/btrfs.c
|
|
@@ -1409,8 +1409,8 @@ grub_btrfs_mount (grub_device_t dev)
|
|
}
|
|
|
|
data->n_devices_allocated = 16;
|
|
- data->devices_attached = grub_malloc (sizeof (data->devices_attached[0])
|
|
- * data->n_devices_allocated);
|
|
+ data->devices_attached = grub_calloc (data->n_devices_allocated,
|
|
+ sizeof (data->devices_attached[0]));
|
|
if (!data->devices_attached)
|
|
{
|
|
grub_free (data);
|
|
diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c
|
|
index d76f3f137..4965ef19a 100644
|
|
--- a/grub-core/fs/hfspluscomp.c
|
|
+++ b/grub-core/fs/hfspluscomp.c
|
|
@@ -244,14 +244,19 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node)
|
|
return 0;
|
|
}
|
|
node->compress_index_size = grub_le_to_cpu32 (index_size);
|
|
- node->compress_index = grub_malloc (node->compress_index_size
|
|
- * sizeof (node->compress_index[0]));
|
|
+ node->compress_index = grub_calloc (node->compress_index_size,
|
|
+ sizeof (node->compress_index[0]));
|
|
if (!node->compress_index)
|
|
{
|
|
node->compressed = 0;
|
|
grub_free (attr_node);
|
|
return grub_errno;
|
|
}
|
|
+
|
|
+ /*
|
|
+ * The node->compress_index_size * sizeof (node->compress_index[0]) is safe here
|
|
+ * due to relevant checks done in grub_calloc() above.
|
|
+ */
|
|
if (grub_hfsplus_read_file (node, 0, 0,
|
|
0x104 + sizeof (index_size),
|
|
node->compress_index_size
|
|
diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
|
|
index 0ee9bb2e8..5239cdd5c 100644
|
|
--- a/grub-core/fs/squash4.c
|
|
+++ b/grub-core/fs/squash4.c
|
|
@@ -810,10 +810,10 @@ direct_read (struct grub_squash_data *data,
|
|
break;
|
|
}
|
|
total_blocks = ((total_size + data->blksz - 1) >> data->log2_blksz);
|
|
- ino->block_sizes = grub_malloc (total_blocks
|
|
- * sizeof (ino->block_sizes[0]));
|
|
- ino->cumulated_block_sizes = grub_malloc (total_blocks
|
|
- * sizeof (ino->cumulated_block_sizes[0]));
|
|
+ ino->block_sizes = grub_calloc (total_blocks,
|
|
+ sizeof (ino->block_sizes[0]));
|
|
+ ino->cumulated_block_sizes = grub_calloc (total_blocks,
|
|
+ sizeof (ino->cumulated_block_sizes[0]));
|
|
if (!ino->block_sizes || !ino->cumulated_block_sizes)
|
|
{
|
|
grub_free (ino->block_sizes);
|