Merge tag 'v2026.01-rc5' into next

Prepare v2026.01-rc5
This commit is contained in:
Tom Rini
2025-12-22 16:31:21 -06:00
12 changed files with 16 additions and 12 deletions

View File

@@ -279,7 +279,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (!arg)
arg = net_boot_file_name;
if (arg) {
if (*arg) {
/* Parse [ip:[port:]]fname */
i = 0;
while ((*(words + i) = strsep(&arg, ":")))
@@ -342,6 +342,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (tftp_loop(eth_get_dev(), laddr, fname, srvip, port) < 0)
ret = CMD_RET_FAILURE;
out:
free(arg);
if (arg != net_boot_file_name)
free(arg);
return ret;
}