35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 17216748c827290d32336c6ed0af71bcf0849672 Mon Sep 17 00:00:00 2001
|
|
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
|
|
Date: Thu, 17 Feb 2022 07:27:58 -0500
|
|
Subject: [PATCH] net: fix null pointer dereference when parsing
|
|
ICMP6_ROUTER_ADVERTISE messages
|
|
|
|
During UEFI PXE boot in IPv6 network, if the DHCP server adopts
|
|
stateful automatic configuration, then the client receives a
|
|
ICMP6_ROUTER_ADVERTISE multicast message from the server. This may be
|
|
received without the interfaced having a configured network address,
|
|
so orig_inf will be null, which can lead to a null dereference when
|
|
creating the default route.
|
|
|
|
Fixes bug: https://savannah.gnu.org/bugs/index.php?62072
|
|
---
|
|
grub-core/net/icmp6.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
|
|
index 2cbd95d..264fc4a 100644
|
|
--- a/grub-core/net/icmp6.c
|
|
+++ b/grub-core/net/icmp6.c
|
|
@@ -477,7 +477,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
|
|
|
|
/* May not have gotten slaac info, find a global address on this
|
|
card. */
|
|
- if (route_inf == NULL)
|
|
+ if (route_inf == NULL && orig_inf != NULL)
|
|
{
|
|
FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
|
|
{
|
|
--
|
|
2.19.1
|
|
|