From: B Horn <b@horn.uk>
Date: Thu, 28 Nov 2024 04:05:04 +0000 (+0000)
Subject: net: Unregister net_default_ip and net_default_mac variables hooks on unload
X-Git-Tag: archive/raspbian/2.12-8+rpi1^2~49
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=382db81cf904fe2adc19dccb6f4b230369416493;p=grub2.git

net: Unregister net_default_ip and net_default_mac variables hooks on unload

The net module is a dependency of normal. So, it shouldn't be possible
to unload the net. Though unregister variables hooks as a precaution.
It also gets in line with unregistering the other net module hooks.

Signed-off-by: B Horn <b@horn.uk>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Gbp-Pq: Topic cve-2025-jan
Gbp-Pq: Name net-Unregister-net_default_ip-and-net_default_mac-variabl.patch
---

diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 556c21d..9c6c84c 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -2214,6 +2214,8 @@ GRUB_MOD_FINI(net)
 
   grub_register_variable_hook ("net_default_server", 0, 0);
   grub_register_variable_hook ("pxe_default_server", 0, 0);
+  grub_register_variable_hook ("net_default_ip", 0, 0);
+  grub_register_variable_hook ("net_default_mac", 0, 0);
 
   grub_bootp_fini ();
   grub_dns_fini ();