74f9c62794
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com> (cherry picked from commit c141a13130da5dca205b607533751a6ba6c9581e)
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From dee2c14fd66bc497cdc74c69fde8c9b84637c8eb Mon Sep 17 00:00:00 2001
|
|
From: Lidong Chen <lidong.chen@oracle.com>
|
|
Date: Wed, 22 Jan 2025 18:04:43 +0000
|
|
Subject: [PATCH 62/73] net: Prevent overflows when allocating memory for
|
|
arrays
|
|
|
|
Use grub_calloc() when allocating memory for arrays to ensure proper
|
|
overflow checks are in place.
|
|
|
|
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/net/dns.c | 4 ++--
|
|
grub-core/net/net.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
|
|
index 39b0c46cf..f20cd6f83 100644
|
|
--- a/grub-core/net/dns.c
|
|
+++ b/grub-core/net/dns.c
|
|
@@ -470,8 +470,8 @@ grub_net_dns_lookup (const char *name,
|
|
&& grub_get_time_ms () < dns_cache[h].limit_time)
|
|
{
|
|
grub_dprintf ("dns", "retrieved from cache\n");
|
|
- *addresses = grub_malloc (dns_cache[h].naddresses
|
|
- * sizeof ((*addresses)[0]));
|
|
+ *addresses = grub_calloc (dns_cache[h].naddresses,
|
|
+ sizeof ((*addresses)[0]));
|
|
if (!*addresses)
|
|
return grub_errno;
|
|
*naddresses = dns_cache[h].naddresses;
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 3ca7e0796..1abdc097f 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -88,8 +88,8 @@ grub_net_link_layer_add_address (struct grub_net_card *card,
|
|
/* Add sender to cache table. */
|
|
if (card->link_layer_table == NULL)
|
|
{
|
|
- card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE
|
|
- * sizeof (card->link_layer_table[0]));
|
|
+ card->link_layer_table = grub_calloc (LINK_LAYER_CACHE_SIZE,
|
|
+ sizeof (card->link_layer_table[0]));
|
|
if (card->link_layer_table == NULL)
|
|
return;
|
|
}
|
|
--
|
|
2.33.0
|
|
|