From c867045eef153b0beab69fbc74059fcfc4ad9472 Mon Sep 17 00:00:00 2001 From: Sean Edmond Date: Wed, 8 May 2024 19:39:01 -0700 Subject: net: Enhancements for dhcp option 209 - Enable option 209 by default - Set pxelinux_configfile to NULL to avoid potential double free - change hardcoded 209 to a define Signed-off-by: Sean Edmond --- cmd/Kconfig | 1 + cmd/pxe.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'cmd') diff --git a/cmd/Kconfig b/cmd/Kconfig index c182d73ddbd..54c4ab8570c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1898,6 +1898,7 @@ config BOOTP_PXE_CLIENTARCH config BOOTP_PXE_DHCP_OPTION bool "Request & store 'pxe_configfile' from BOOTP/DHCP server" + default y depends on BOOTP_PXE config BOOTP_VCI_STRING diff --git a/cmd/pxe.c b/cmd/pxe.c index 21134eb7a30..9404f445187 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -65,6 +65,8 @@ static int pxe_dhcp_option_path(struct pxe_context *ctx, unsigned long pxefile_a int ret = get_pxe_file(ctx, pxelinux_configfile, pxefile_addr_r); free(pxelinux_configfile); + /* set to NULL to avoid double-free if DHCP is tried again */ + pxelinux_configfile = NULL; return ret; } -- cgit v1.3.1