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