summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorSean Edmond <[email protected]>2024-05-08 19:39:01 -0700
committerTom Rini <[email protected]>2025-05-23 11:28:51 -0600
commitc867045eef153b0beab69fbc74059fcfc4ad9472 (patch)
treee74ff7617a9f78252b2f53bc91c1edb496345cd3 /cmd
parent4b3706607c0015ba99a86d8631446564c117e06a (diff)
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 <[email protected]>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/Kconfig1
-rw-r--r--cmd/pxe.c2
2 files changed, 3 insertions, 0 deletions
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;
}