b209619f5b
Resolves CVE-2024-45775 CVE-2025-0624 Resolves: #RHEL-75735 Resolves: #RHEL-79837 Signed-off-by: Leo Sandoval <lsandova@redhat.com> Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Fri, 15 Nov 2024 13:12:09 +0000
|
|
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 69223164d..f0896979d 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -1940,9 +1940,9 @@ grub_net_restore_hw (void)
|
|
}
|
|
|
|
grub_err_t
|
|
-grub_net_search_configfile (char *config)
|
|
+grub_net_search_configfile (char *config, grub_size_t config_buf_len)
|
|
{
|
|
- grub_size_t config_len;
|
|
+ grub_size_t config_len, suffix_len;
|
|
char *suffix;
|
|
|
|
auto int search_through (grub_size_t num_tries, grub_size_t slice_size);
|
|
@@ -1979,6 +1979,7 @@ grub_net_search_configfile (char *config)
|
|
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_configfile (char *config)
|
|
|
|
if (client_uuid)
|
|
{
|
|
- grub_strcpy (suffix, client_uuid);
|
|
+ grub_strlcpy (suffix, client_uuid, suffix_len);
|
|
if (search_through (1, 0) == 0) return GRUB_ERR_NONE;
|
|
}
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 93f33c167..f5e9b54f7 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -349,7 +349,7 @@ grub_try_normal_prefix (const char *prefix)
|
|
return err;
|
|
|
|
grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
- err = grub_net_search_configfile (config);
|
|
+ err = grub_net_search_configfile (config, config_len);
|
|
}
|
|
|
|
if (err != GRUB_ERR_NONE)
|
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
|
index 4a815fa91..8c8521944 100644
|
|
--- a/include/grub/net.h
|
|
+++ b/include/grub/net.h
|
|
@@ -646,6 +646,6 @@ extern char *grub_net_default_server;
|
|
#define VLANTAG_IDENTIFIER 0x8100
|
|
|
|
grub_err_t
|
|
-grub_net_search_configfile (char *config);
|
|
+grub_net_search_configfile (char *config, grub_size_t config_buf_len);
|
|
|
|
#endif /* ! GRUB_NET_HEADER */
|