francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 80e0e9b2558c40fb108ae7a869362566eb4c1ead Mon Sep 17 00:00:00 2001
|
|
From: Thomas Frauendorfer | Miray Software <tf@miray.de>
|
|
Date: Fri, 9 May 2025 14:20:47 +0200
|
|
Subject: [PATCH] net/net: Unregister net_set_vlan command on unload
|
|
|
|
The commit 954c48b9c (net/net: Add net_set_vlan command) added command
|
|
net_set_vlan to the net module. Unfortunately the commit only added the
|
|
grub_register_command() call on module load but missed the
|
|
grub_unregister_command() on unload. Let's fix this.
|
|
|
|
Fixes: CVE-2025-54770
|
|
Fixes: 954c48b9c (net/net: Add net_set_vlan command)
|
|
|
|
CVE: CVE-2025-54770
|
|
|
|
Upstream-Status: Backport
|
|
[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=10e58a14db20e17d1b6a39abe38df01fef98e29d]
|
|
|
|
Reported-by: Thomas Frauendorfer | Miray Software <tf@miray.de>
|
|
Signed-off-by: Thomas Frauendorfer | Miray Software <tf@miray.de>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
|
|
---
|
|
grub-core/net/net.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 2b45c27d1..05f11be08 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -2080,6 +2080,7 @@ GRUB_MOD_FINI(net)
|
|
grub_unregister_command (cmd_deladdr);
|
|
grub_unregister_command (cmd_addroute);
|
|
grub_unregister_command (cmd_delroute);
|
|
+ grub_unregister_command (cmd_setvlan);
|
|
grub_unregister_command (cmd_lsroutes);
|
|
grub_unregister_command (cmd_lscards);
|
|
grub_unregister_command (cmd_lsaddr);
|
|
--
|
|
2.34.1
|
|
|