mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
ce21efa858
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
29 lines
946 B
Diff
29 lines
946 B
Diff
From 6714d7ecffe58021760e4d1ebfa9cc3473f7fb24 Mon Sep 17 00:00:00 2001
|
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
Date: Sun, 20 Mar 2016 10:32:33 +0300
|
|
Subject: [PATCH 010/123] bootp: check that interface is not NULL in
|
|
configure_by_dhcp_ack
|
|
|
|
grub_net_add_addr may fail with OOM and we use returned interface
|
|
later without any checks.
|
|
---
|
|
grub-core/net/bootp.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
|
index 09c6f7606..189551a48 100644
|
|
--- a/grub-core/net/bootp.c
|
|
+++ b/grub-core/net/bootp.c
|
|
@@ -157,6 +157,9 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
|
hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
|
|
|
inter = grub_net_add_addr (name, card, &addr, &hwaddr, flags);
|
|
+ if (!inter)
|
|
+ return 0;
|
|
+
|
|
#if 0
|
|
/* This is likely based on misunderstanding. gateway_ip refers to
|
|
address of BOOTP relay and should not be used after BOOTP transaction
|
|
--
|
|
2.14.3
|
|
|