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>
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Tue, 11 Feb 2025 16:38:44 -0600
|
|
Subject: [PATCH] net: Fix OOB write in grub_net_search_config_file()
|
|
|
|
The function included a call to grub_strcpy() which copied data from an
|
|
environment variable to a buffer allocated in grub_cmd_normal(). The
|
|
grub_cmd_normal() didn't consider the length of the environment variable.
|
|
So, the copy operation could exceed the allocation and lead to an OOB
|
|
write. Fix the issue by replacing grub_strcpy() with grub_strlcpy() and
|
|
pass the underlying buffers size to the grub_net_search_config_file().
|
|
|
|
Fixes: CVE-2025-0624
|
|
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/net/net.c | 7 ++++---
|
|
grub-core/normal/main.c | 2 +-
|
|
include/grub/net.h | 2 +-
|
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 251286227..6c0bd00b4 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -1971,14 +1971,15 @@ grub_config_search_through (char *config, char *suffix,
|
|
}
|
|
|
|
grub_err_t
|
|
-grub_net_search_config_file (char *config)
|
|
+grub_net_search_config_file (char *config, grub_size_t config_buf_len)
|
|
{
|
|
- grub_size_t config_len;
|
|
+ grub_size_t config_len, suffix_len;
|
|
char *suffix;
|
|
|
|
config_len = grub_strlen (config);
|
|
config[config_len] = '-';
|
|
suffix = config + config_len + 1;
|
|
+ suffix_len = config_buf_len - (config_len + 1);
|
|
|
|
struct grub_net_network_level_interface *inf;
|
|
FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
|
|
@@ -2004,7 +2005,7 @@ grub_net_search_config_file (char *config)
|
|
|
|
if (client_uuid)
|
|
{
|
|
- grub_strcpy (suffix, client_uuid);
|
|
+ grub_strlcpy (suffix, client_uuid, suffix_len);
|
|
if (grub_config_search_through (config, suffix, 1, 0) == 0)
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 6f6e4a813..49b947292 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -360,7 +360,7 @@ grub_try_normal_prefix (const char *prefix)
|
|
return err;
|
|
|
|
grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
- err = grub_net_search_config_file (config);
|
|
+ err = grub_net_search_config_file (config, config_len);
|
|
}
|
|
|
|
if (err != GRUB_ERR_NONE)
|
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
|
index 43eba9216..1101b0397 100644
|
|
--- a/include/grub/net.h
|
|
+++ b/include/grub/net.h
|
|
@@ -648,7 +648,7 @@ void
|
|
grub_net_remove_dns_server (const struct grub_net_network_level_address *s);
|
|
|
|
grub_err_t
|
|
-grub_net_search_config_file (char *config);
|
|
+grub_net_search_config_file (char *config, grub_size_t config_buf_len);
|
|
|
|
extern char *grub_net_default_server;
|
|
|