From ca67b09c015d4af3ae3cce12aa72e60941dbb8b5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 18:29:52 +0200 Subject: Adding debian version 2.06-13+deb12u1. Signed-off-by: Daniel Baumann --- .../patches/bootp-process-dhcpack-http-boot.patch | 124 +++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 debian/patches/bootp-process-dhcpack-http-boot.patch (limited to 'debian/patches/bootp-process-dhcpack-http-boot.patch') diff --git a/debian/patches/bootp-process-dhcpack-http-boot.patch b/debian/patches/bootp-process-dhcpack-http-boot.patch new file mode 100644 index 0000000..64b19f6 --- /dev/null +++ b/debian/patches/bootp-process-dhcpack-http-boot.patch @@ -0,0 +1,124 @@ +From cd78a54e5fa8d4a6f9223b7ddbb7db86ca0dd993 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Thu, 27 Oct 2016 17:42:19 -0400 +Subject: bootp: Add processing DHCPACK packet from HTTP Boot + +The vendor class identifier with the string "HTTPClient" is used to denote the +packet as responding to HTTP boot request. In DHCP4 config, the filename for +HTTP boot is the URL of the boot file while for PXE boot it is the path to the +boot file. As a consequence, the next-server becomes obseleted because the HTTP +URL already contains the server address for the boot file. For DHCP6 config, +there's no difference definition in existing config as dhcp6.bootfile-url can +be used to specify URL for both HTTP and PXE boot file. + +This patch adds processing for "HTTPClient" vendor class identifier in DHCPACK +packet by treating it as HTTP format, not as the PXE format. + +Signed-off-by: Michael Chang +Signed-off-by: Ken Lin + +Last-Update: 2021-09-24 + +Patch-Name: bootp-process-dhcpack-http-boot.patch +--- + grub-core/net/bootp.c | 60 ++++++++++++++++++++++++++++++++++++++++++- + include/grub/net.h | 1 + + 2 files changed, 60 insertions(+), 1 deletion(-) + +diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c +index 00c11af39..f35d582b8 100644 +--- a/grub-core/net/bootp.c ++++ b/grub-core/net/bootp.c +@@ -154,7 +154,7 @@ struct grub_dhcp_request_options + { + grub_uint8_t type; + grub_uint8_t len; +- grub_uint8_t data[7]; ++ grub_uint8_t data[8]; + } GRUB_PACKED parameter_request; + grub_uint8_t end; + } GRUB_PACKED; +@@ -542,6 +542,63 @@ grub_net_configure_by_dhcp_ack (const char *name, + grub_free (val); + } + ++ opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER, ++ &opt_len); ++ if (opt && opt_len) ++ { ++ grub_env_set_net_property (name, "vendor_class_identifier", ++ (const char *) opt, opt_len); ++ if (opt_len == sizeof ("HTTPClient") - 1 && ++ grub_memcmp (opt, "HTTPClient", sizeof ("HTTPClient") - 1) == 0) ++ { ++ char *proto, *ip, *pa; ++ ++ if (!dissect_url (bp->boot_file, &proto, &ip, &pa)) ++ return inter; ++ ++ grub_env_set_net_property (name, "boot_file", pa, grub_strlen (pa)); ++ if (is_def) ++ { ++ grub_net_default_server = grub_strdup (ip); ++ grub_env_set ("net_default_interface", name); ++ grub_env_export ("net_default_interface"); ++ } ++ if (device && !*device) ++ { ++ *device = grub_xasprintf ("%s,%s", proto, ip); ++ grub_print_error (); ++ } ++ if (path) ++ { ++ *path = grub_strdup (pa); ++ grub_print_error (); ++ if (*path) ++ { ++ char *slash; ++ slash = grub_strrchr (*path, '/'); ++ if (slash) ++ *slash = 0; ++ else ++ **path = 0; ++ } ++ } ++ grub_net_add_ipv4_local (inter, mask); ++ inter->dhcp_ack = grub_malloc (size); ++ if (inter->dhcp_ack) ++ { ++ grub_memcpy (inter->dhcp_ack, bp, size); ++ inter->dhcp_acklen = size; ++ } ++ else ++ grub_errno = GRUB_ERR_NONE; ++ ++ grub_free (proto); ++ grub_free (ip); ++ grub_free (pa); ++ return inter; ++ } ++ } ++ + inter->dhcp_ack = grub_malloc (size); + if (inter->dhcp_ack) + { +@@ -616,6 +673,7 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface) + GRUB_NET_BOOTP_HOSTNAME, + GRUB_NET_BOOTP_ROOT_PATH, + GRUB_NET_BOOTP_EXTENSIONS_PATH, ++ GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER, + }, + }, + GRUB_NET_BOOTP_END, +diff --git a/include/grub/net.h b/include/grub/net.h +index 1cb05627e..cbcae79b1 100644 +--- a/include/grub/net.h ++++ b/include/grub/net.h +@@ -528,6 +528,7 @@ enum + GRUB_NET_DHCP_MESSAGE_TYPE = 53, + GRUB_NET_DHCP_SERVER_IDENTIFIER = 54, + GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55, ++ GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER = 60, + GRUB_NET_BOOTP_CLIENT_ID = 61, + GRUB_NET_DHCP_TFTP_SERVER_NAME = 66, + GRUB_NET_DHCP_BOOTFILE_NAME = 67, -- cgit v1.2.3