dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0259-efinet-Setting-DNS-server-from-UEFI-protocol.patch

4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Michael Chang <mchang@suse.com>
4fe85b
Date: Thu, 14 Jul 2016 17:48:45 +0800
4fe85b
Subject: [PATCH] efinet: Setting DNS server from UEFI protocol
4fe85b
4fe85b
In the URI device path node, any name rahter than address can be used for
4fe85b
looking up the resources so that DNS service become needed to get answer of the
4fe85b
name's address. Unfortunately the DNS is not defined in any of the device path
4fe85b
nodes so that we use the EFI_IP4_CONFIG2_PROTOCOL and EFI_IP6_CONFIG_PROTOCOL
4fe85b
to obtain it.
4fe85b
4fe85b
These two protcols are defined the sections of UEFI specification.
4fe85b
4fe85b
 27.5 EFI IPv4 Configuration II Protocol
4fe85b
 27.7 EFI IPv6 Configuration Protocol
4fe85b
4fe85b
include/grub/efi/api.h:
4fe85b
Add new structure and protocol UUID of EFI_IP4_CONFIG2_PROTOCOL and
4fe85b
EFI_IP6_CONFIG_PROTOCOL.
4fe85b
4fe85b
grub-core/net/drivers/efi/efinet.c:
4fe85b
Use the EFI_IP4_CONFIG2_PROTOCOL and EFI_IP6_CONFIG_PROTOCOL to obtain the list
4fe85b
of DNS server address for IPv4 and IPv6 respectively. The address of DNS
4fe85b
servers is structured into DHCPACK packet and feed into the same DHCP packet
4fe85b
processing functions to ensure the network interface is setting up the same way
4fe85b
it used to be.
4fe85b
4fe85b
Signed-off-by: Michael Chang <mchang@suse.com>
4fe85b
Signed-off-by: Ken Lin <ken.lin@hpe.com>
4fe85b
---
4fe85b
 grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++++++++++
4fe85b
 include/grub/efi/api.h             |  76 +++++++++++++++++
4fe85b
 2 files changed, 239 insertions(+)
4fe85b
4fe85b
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
4fe85b
index 6f75ff1f9d1..25616a9c6c8 100644
4fe85b
--- a/grub-core/net/drivers/efi/efinet.c
4fe85b
+++ b/grub-core/net/drivers/efi/efinet.c
4fe85b
@@ -34,6 +34,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
4fe85b
 /* GUID.  */
4fe85b
 static grub_efi_guid_t net_io_guid = GRUB_EFI_SIMPLE_NETWORK_GUID;
4fe85b
 static grub_efi_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
4fe85b
+static grub_efi_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
4fe85b
+static grub_efi_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
4fe85b
 
4fe85b
 static grub_err_t
4fe85b
 send_card_buffer (struct grub_net_card *dev,
4fe85b
@@ -343,6 +345,125 @@ grub_efinet_findcards (void)
4fe85b
   grub_free (handles);
4fe85b
 }
4fe85b
 
4fe85b
+static grub_efi_handle_t
4fe85b
+grub_efi_locate_device_path (grub_efi_guid_t *protocol, grub_efi_device_path_t *device_path,
4fe85b
+			    grub_efi_device_path_t **r_device_path)
4fe85b
+{
4fe85b
+  grub_efi_handle_t handle;
4fe85b
+  grub_efi_status_t status;
4fe85b
+
4fe85b
+  status = efi_call_3 (grub_efi_system_table->boot_services->locate_device_path,
4fe85b
+		      protocol, &device_path, &handle);
4fe85b
+
4fe85b
+  if (status != GRUB_EFI_SUCCESS)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  if (r_device_path)
4fe85b
+    *r_device_path = device_path;
4fe85b
+
4fe85b
+  return handle;
4fe85b
+}
4fe85b
+
4fe85b
+static grub_efi_ipv4_address_t *
4fe85b
+grub_dns_server_ip4_address (grub_efi_device_path_t *dp, grub_efi_uintn_t *num_dns)
4fe85b
+{
4fe85b
+  grub_efi_handle_t hnd;
4fe85b
+  grub_efi_status_t status;
4fe85b
+  grub_efi_ip4_config2_protocol_t *conf;
4fe85b
+  grub_efi_ipv4_address_t *addrs;
4fe85b
+  grub_efi_uintn_t data_size = 1 * sizeof (grub_efi_ipv4_address_t);
4fe85b
+
4fe85b
+  hnd = grub_efi_locate_device_path (&ip4_config_guid, dp, NULL);
4fe85b
+
4fe85b
+  if (!hnd)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  conf = grub_efi_open_protocol (hnd, &ip4_config_guid,
4fe85b
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
4fe85b
+
4fe85b
+  if (!conf)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  addrs  = grub_malloc (data_size);
4fe85b
+  if (!addrs)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  status = efi_call_4 (conf->get_data, conf,
4fe85b
+		      GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
4fe85b
+		      &data_size, addrs);
4fe85b
+
4fe85b
+  if (status == GRUB_EFI_BUFFER_TOO_SMALL)
4fe85b
+    {
4fe85b
+      grub_free (addrs);
4fe85b
+      addrs  = grub_malloc (data_size);
4fe85b
+      if (!addrs)
4fe85b
+	return 0;
4fe85b
+
4fe85b
+      status = efi_call_4 (conf->get_data,  conf,
4fe85b
+			  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
4fe85b
+			  &data_size, addrs);
4fe85b
+    }
4fe85b
+
4fe85b
+  if (status != GRUB_EFI_SUCCESS)
4fe85b
+    {
4fe85b
+      grub_free (addrs);
4fe85b
+      return 0;
4fe85b
+    }
4fe85b
+
4fe85b
+  *num_dns = data_size / sizeof (grub_efi_ipv4_address_t);
4fe85b
+  return addrs;
4fe85b
+}
4fe85b
+
4fe85b
+static grub_efi_ipv6_address_t *
4fe85b
+grub_dns_server_ip6_address (grub_efi_device_path_t *dp, grub_efi_uintn_t *num_dns)
4fe85b
+{
4fe85b
+  grub_efi_handle_t hnd;
4fe85b
+  grub_efi_status_t status;
4fe85b
+  grub_efi_ip6_config_protocol_t *conf;
4fe85b
+  grub_efi_ipv6_address_t *addrs;
4fe85b
+  grub_efi_uintn_t data_size = 1 * sizeof (grub_efi_ipv6_address_t);
4fe85b
+
4fe85b
+  hnd = grub_efi_locate_device_path (&ip6_config_guid, dp, NULL);
4fe85b
+
4fe85b
+  if (!hnd)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  conf = grub_efi_open_protocol (hnd, &ip6_config_guid,
4fe85b
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
4fe85b
+
4fe85b
+  if (!conf)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  addrs  = grub_malloc (data_size);
4fe85b
+  if (!addrs)
4fe85b
+    return 0;
4fe85b
+
4fe85b
+  status = efi_call_4 (conf->get_data, conf,
4fe85b
+		      GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
4fe85b
+		      &data_size, addrs);
4fe85b
+
4fe85b
+  if (status == GRUB_EFI_BUFFER_TOO_SMALL)
4fe85b
+    {
4fe85b
+      grub_free (addrs);
4fe85b
+      addrs  = grub_malloc (data_size);
4fe85b
+      if (!addrs)
4fe85b
+	return 0;
4fe85b
+
4fe85b
+      status = efi_call_4 (conf->get_data,  conf,
4fe85b
+			  GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
4fe85b
+			  &data_size, addrs);
4fe85b
+    }
4fe85b
+
4fe85b
+  if (status != GRUB_EFI_SUCCESS)
4fe85b
+    {
4fe85b
+      grub_free (addrs);
4fe85b
+      return 0;
4fe85b
+    }
4fe85b
+
4fe85b
+  *num_dns = data_size / sizeof (grub_efi_ipv6_address_t);
4fe85b
+  return addrs;
4fe85b
+}
4fe85b
+
4fe85b
 static struct grub_net_buff *
4fe85b
 grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *use_ipv6)
4fe85b
 {
4fe85b
@@ -401,6 +522,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
4fe85b
       grub_efi_ipv4_device_path_t *ipv4 = (grub_efi_ipv4_device_path_t *) ldp;
4fe85b
       struct grub_net_bootp_packet *bp;
4fe85b
       grub_uint8_t *ptr;
4fe85b
+      grub_efi_ipv4_address_t *dns;
4fe85b
+      grub_efi_uintn_t num_dns;
4fe85b
 
4fe85b
       bp = (struct grub_net_bootp_packet *) nb->tail;
4fe85b
       err = grub_netbuff_put (nb, sizeof (*bp) + 4);
4fe85b
@@ -462,6 +585,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
4fe85b
       *ptr++ = sizeof ("HTTPClient") - 1;
4fe85b
       grub_memcpy (ptr, "HTTPClient", sizeof ("HTTPClient") - 1);
4fe85b
 
4fe85b
+      dns = grub_dns_server_ip4_address (dp, &num_dns);
4fe85b
+      if (dns)
4fe85b
+	{
4fe85b
+	  grub_efi_uintn_t size_dns = sizeof (*dns) * num_dns;
4fe85b
+
4fe85b
+	  ptr = nb->tail;
4fe85b
+	  err = grub_netbuff_put (nb, size_dns + 2);
4fe85b
+	  if (err)
4fe85b
+	    {
4fe85b
+	      grub_free (ddp);
4fe85b
+	      grub_netbuff_free (nb);
4fe85b
+	      return NULL;
4fe85b
+	    }
4fe85b
+	  *ptr++ = GRUB_NET_BOOTP_DNS;
4fe85b
+	  *ptr++ = size_dns;
4fe85b
+	  grub_memcpy (ptr, dns, size_dns);
4fe85b
+	  grub_free (dns);
4fe85b
+	}
4fe85b
+
4fe85b
       ptr = nb->tail;
4fe85b
       err = grub_netbuff_put (nb, 1);
4fe85b
       if (err)
4fe85b
@@ -494,6 +636,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
4fe85b
       struct grub_net_dhcp6_option *opt;
4fe85b
       struct grub_net_dhcp6_option_iana *iana;
4fe85b
       struct grub_net_dhcp6_option_iaaddr *iaaddr;
4fe85b
+      grub_efi_ipv6_address_t *dns;
4fe85b
+      grub_efi_uintn_t num_dns;
4fe85b
 
4fe85b
       d6p = (struct grub_net_dhcp6_packet *)nb->tail;
4fe85b
       err = grub_netbuff_put (nb, sizeof(*d6p));
4fe85b
@@ -557,6 +701,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
4fe85b
       opt->len = grub_cpu_to_be16 (uri_len);
4fe85b
       grub_memcpy (opt->data, uri_dp->uri, uri_len);
4fe85b
 
4fe85b
+      dns = grub_dns_server_ip6_address (dp, &num_dns);
4fe85b
+      if (dns)
4fe85b
+	{
4fe85b
+	  grub_efi_uintn_t size_dns = sizeof (*dns) * num_dns;
4fe85b
+
4fe85b
+	  opt = (struct grub_net_dhcp6_option *)nb->tail;
4fe85b
+	  err = grub_netbuff_put (nb, sizeof(*opt) + size_dns);
4fe85b
+	  if (err)
4fe85b
+	  {
4fe85b
+	    grub_free (ddp);
4fe85b
+	    grub_netbuff_free (nb);
4fe85b
+	    return NULL;
4fe85b
+	  }
4fe85b
+	  opt->code = grub_cpu_to_be16_compile_time (GRUB_NET_DHCP6_OPTION_DNS_SERVERS);
4fe85b
+	  opt->len = grub_cpu_to_be16 (size_dns);
4fe85b
+	  grub_memcpy (opt->data, dns, size_dns);
4fe85b
+	  grub_free (dns);
4fe85b
+	}
4fe85b
+
4fe85b
       *use_ipv6 = 1;
4fe85b
     }
4fe85b
 
4fe85b
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
4fe85b
index 76ad56aa2b0..852daddfb0f 100644
4fe85b
--- a/include/grub/efi/api.h
4fe85b
+++ b/include/grub/efi/api.h
4fe85b
@@ -289,6 +289,16 @@
4fe85b
       { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \
4fe85b
   }
4fe85b
 
4fe85b
+#define GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID \
4fe85b
+  { 0x5b446ed1, 0xe30b, 0x4faa, \
4fe85b
+      { 0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } \
4fe85b
+  }
4fe85b
+
4fe85b
+#define GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID \
4fe85b
+  { 0x937fe521, 0x95ae, 0x4d1a, \
4fe85b
+      { 0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \
4fe85b
+  }
4fe85b
+
4fe85b
 struct grub_efi_sal_system_table
4fe85b
 {
4fe85b
   grub_uint32_t signature;
4fe85b
@@ -1785,6 +1795,72 @@ struct grub_efi_block_io
4fe85b
 };
4fe85b
 typedef struct grub_efi_block_io grub_efi_block_io_t;
4fe85b
 
4fe85b
+enum grub_efi_ip4_config2_data_type {
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_POLICY,
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_GATEWAY,
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
4fe85b
+  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MAXIMUM
4fe85b
+};
4fe85b
+typedef enum grub_efi_ip4_config2_data_type grub_efi_ip4_config2_data_type_t;
4fe85b
+
4fe85b
+struct grub_efi_ip4_config2_protocol
4fe85b
+{
4fe85b
+  grub_efi_status_t (*set_data) (struct grub_efi_ip4_config2_protocol *this,
4fe85b
+				 grub_efi_ip4_config2_data_type_t data_type,
4fe85b
+				 grub_efi_uintn_t data_size,
4fe85b
+				 void *data);
4fe85b
+
4fe85b
+  grub_efi_status_t (*get_data) (struct grub_efi_ip4_config2_protocol *this,
4fe85b
+				 grub_efi_ip4_config2_data_type_t data_type,
4fe85b
+				 grub_efi_uintn_t *data_size,
4fe85b
+				 void *data);
4fe85b
+
4fe85b
+  grub_efi_status_t (*register_data_notify) (struct grub_efi_ip4_config2_protocol *this,
4fe85b
+					     grub_efi_ip4_config2_data_type_t data_type,
4fe85b
+					     grub_efi_event_t event);
4fe85b
+
4fe85b
+  grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip4_config2_protocol *this,
4fe85b
+					     grub_efi_ip4_config2_data_type_t data_type,
4fe85b
+					     grub_efi_event_t event);
4fe85b
+};
4fe85b
+typedef struct grub_efi_ip4_config2_protocol grub_efi_ip4_config2_protocol_t;
4fe85b
+
4fe85b
+enum grub_efi_ip6_config_data_type {
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_ALT_INTERFACEID,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_POLICY,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_DUP_ADDR_DETECT_TRANSMITS,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_GATEWAY,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
4fe85b
+  GRUB_EFI_IP6_CONFIG_DATA_TYPE_MAXIMUM
4fe85b
+};
4fe85b
+typedef enum grub_efi_ip6_config_data_type grub_efi_ip6_config_data_type_t;
4fe85b
+
4fe85b
+struct grub_efi_ip6_config_protocol
4fe85b
+{
4fe85b
+  grub_efi_status_t (*set_data) (struct grub_efi_ip6_config_protocol *this,
4fe85b
+				 grub_efi_ip6_config_data_type_t data_type,
4fe85b
+				 grub_efi_uintn_t data_size,
4fe85b
+				 void *data);
4fe85b
+
4fe85b
+  grub_efi_status_t (*get_data) (struct grub_efi_ip6_config_protocol *this,
4fe85b
+				 grub_efi_ip6_config_data_type_t data_type,
4fe85b
+				 grub_efi_uintn_t *data_size,
4fe85b
+				 void *data);
4fe85b
+
4fe85b
+  grub_efi_status_t (*register_data_notify) (struct grub_efi_ip6_config_protocol *this,
4fe85b
+					     grub_efi_ip6_config_data_type_t data_type,
4fe85b
+					     grub_efi_event_t event);
4fe85b
+
4fe85b
+  grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip6_config_protocol *this,
4fe85b
+					     grub_efi_ip6_config_data_type_t data_type,
4fe85b
+					     grub_efi_event_t event);
4fe85b
+};
4fe85b
+typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
4fe85b
+
4fe85b
 #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
4fe85b
   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__)
4fe85b