From 8910efa71b8bab88b0ca81b681b5842fd25b1000 Mon Sep 17 00:00:00 2001 From: Andrew Goodbody Date: Fri, 5 Dec 2025 17:28:36 +0000 Subject: [PATCH 1/9] net: lwip: tftp: Fix filename handling The code to choose the filename to use does not cope with no name set at all. Firstly the test for a name in net_boot_file_name tests the pointer rather than the string it points to. Secondly the cleanup on exit in this case attempts to free a global variable. Fix both issues. Signed-off-by: Andrew Goodbody Reviewed-by: Jerome Forissier --- net/lwip/tftp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/lwip/tftp.c b/net/lwip/tftp.c index 94bacf63075..6c7ffba661e 100644 --- a/net/lwip/tftp.c +++ b/net/lwip/tftp.c @@ -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; } From a8a81af848b88d7ecee64d98a08f6415630305b3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 1 Dec 2025 16:17:24 +0100 Subject: [PATCH 2/9] cmd: lwip/wget: avoid NULL dereference in _set_cacert() Running `wget cacert builtin` leads to a crash in _set_cacert(): Unhandled exception: Load access fault Function _set_cacert() dereferences variable wget_info. We must initialize it before executing the cacert sub-command. Fixes: d3761a31ef09 ("lwip: split net/lwip/wget.c") Signed-off-by: Heinrich Schuchardt Reviewed-by: Jerome Forissier Reviewed-by: Ilias Apalodimas --- cmd/lwip/wget.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/lwip/wget.c b/cmd/lwip/wget.c index fc9bc11cd83..4883ad61bce 100644 --- a/cmd/lwip/wget.c +++ b/cmd/lwip/wget.c @@ -180,6 +180,8 @@ int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ulong dst_addr; char nurl[1024]; + wget_info = &default_wget_info; + #if CONFIG_IS_ENABLED(WGET_CACERT) if (argc == 4 && !strncmp(argv[1], "cacert", strlen("cacert"))) return set_cacert(argv[2], argv[3]); @@ -214,7 +216,6 @@ int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) if (parse_legacy_arg(url, nurl, sizeof(nurl))) return CMD_RET_FAILURE; - wget_info = &default_wget_info; if (wget_do_request(dst_addr, nurl)) return CMD_RET_FAILURE; From d865f2f0162b1121f271bd3e6c1e3f171036aec9 Mon Sep 17 00:00:00 2001 From: Anshul Dalal Date: Thu, 18 Dec 2025 10:31:55 +0530 Subject: [PATCH 3/9] doc: board: ti: fix alt name for tispl.bin in DFU mode The alt name for tispl binary is "tispl.bin" and not "tispl", this patch fixes the documentation to the correct alt name. Fixes: def64b493748 ("doc: board: Add document for DFU boot on am62x SoCs") Fixes: 3633fdbb6b90 ("ti: add support for AM6254atl SiP") Signed-off-by: Anshul Dalal Reviewed-by: Mattijs Korpershoek --- doc/board/ti/am6254atl_sk.rst | 2 +- doc/board/ti/am62x_sk.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/board/ti/am6254atl_sk.rst b/doc/board/ti/am6254atl_sk.rst index cf58ed4c03f..7776ffb14cb 100644 --- a/doc/board/ti/am6254atl_sk.rst +++ b/doc/board/ti/am6254atl_sk.rst @@ -280,7 +280,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img Debugging U-Boot diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst index 1a0e5e07c4b..b50fff87506 100644 --- a/doc/board/ti/am62x_sk.rst +++ b/doc/board/ti/am62x_sk.rst @@ -329,7 +329,7 @@ When using dfu-util the following commands can be used to boot to a U-Boot shell .. prompt:: bash $ dfu-util -a bootloader -D tiboot3.bin - dfu-util -R -a tispl -D tispl.bin + dfu-util -R -a tispl.bin -D tispl.bin dfu-util -R -a u-boot.img -D u-boot.img .. am62x_evm_rst_include_end_dfu_boot From 2333d446b7b133ddfb9dea2d53996d560796ecd9 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 17 Dec 2025 20:57:38 +0100 Subject: [PATCH 4/9] cmd: nvedit: Validate argument count before use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid NULL pointer dereference in case 'env select' is invoked without parameters, check the arg count and make sure it is at least 2, otherwise print usage. The crash is easy to trigger e.g. in sandbox: $ ./u-boot -Tc "env select" Fixes: a97d22ebba23 ("cmd: env: add env select command") Signed-off-by: Marek Vasut Tested-by: Vincent Stehlé Reviewed-by: Ilias Apalodimas --- cmd/nvedit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 11c3cea882b..636bddee1be 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -499,6 +499,9 @@ static int do_env_load(struct cmd_tbl *cmdtp, int flag, int argc, static int do_env_select(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + if (argc < 2) + return CMD_RET_USAGE; + return env_select(argv[1]) ? 1 : 0; } #endif From 24ab2b9684d72af960a7145a88c34ab0ec801c84 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 17 Dec 2025 15:02:27 +0100 Subject: [PATCH 5/9] doc: pytest: fix typo in multiple config options example for buildconfigspec The option should be 'net_lwip' and not 'net lwip' (see all usage of it in the test code base). Fixes: 2bac578c5aba ("test: allow multiple config options in buildconfigspec") Signed-off-by: Quentin Schulz Reviewed-by: Jerome Forissier Reviewed-by: Mattijs Korpershoek --- doc/develop/pytest/usage.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst index df3821da20d..924bc185b51 100644 --- a/doc/develop/pytest/usage.rst +++ b/doc/develop/pytest/usage.rst @@ -546,7 +546,7 @@ either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set: .. code-block:: python - @pytest.mark.buildconfigspec('net', 'net lwip') + @pytest.mark.buildconfigspec('net', 'net_lwip') The ``notbuildconfigspec()`` annotation can be used to require a configuration option not to be set. The following annotation requires ``CONFIG_RISCV=n``: From d24f4ae65433aa7720c075a9f1d1aaf7e1985ced Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Dec 2025 16:19:35 -0600 Subject: [PATCH 6/9] test/py, buildman: Update filelock package version The GitHub dependabot tool has reported a "medium" priority bug CVE-2025-68146, with this package. Update to the patched version. Reported-by: GitHub dependabot Signed-off-by: Tom Rini --- test/py/requirements.txt | 2 +- tools/buildman/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/py/requirements.txt b/test/py/requirements.txt index f9eac7901fb..e080d0f051c 100644 --- a/test/py/requirements.txt +++ b/test/py/requirements.txt @@ -1,4 +1,4 @@ -filelock==3.0.12 +filelock==3.20.1 pycryptodomex==3.21.0 pytest==8.4.2 pytest-xdist==2.5.0 diff --git a/tools/buildman/requirements.txt b/tools/buildman/requirements.txt index d48650cd1e5..d8f76e4e73d 100644 --- a/tools/buildman/requirements.txt +++ b/tools/buildman/requirements.txt @@ -1,2 +1,2 @@ -filelock==3.0.12 +filelock==3.20.1 importlib_resources==6.5.2 From f26db83ca964e81d7f2b3c2c984afdb8bb104678 Mon Sep 17 00:00:00 2001 From: Brian Sune Date: Mon, 22 Dec 2025 22:27:44 +0800 Subject: [PATCH 7/9] fix PL330 CMD supported target The config is wrongly written, result in only support socdk board. Fixes: 92dcb3ad5d98 ("cmd/dma: implement dmareset command") Signed-off-by: Brian Sune Reviewed-by: Tom Rini --- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 5b9c13d85e7..5c611fb3016 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1849,7 +1849,7 @@ menu "Shell scripting commands" config CMD_C5_PL330_DMA bool "Release Reset DMA Channels for PL330 Handshake" - depends on TARGET_SOCFPGA_CYCLONE5_SOCDK + depends on TARGET_SOCFPGA_CYCLONE5 help Provides access to Reset Manager Per2ModRst. Enables DMA channels for ARM PrimeCell PL330 via reset release. From c0add0039825fbd40620284c202f7c4569154605 Mon Sep 17 00:00:00 2001 From: Balaji Selvanathan Date: Mon, 22 Dec 2025 14:31:05 +0530 Subject: [PATCH 8/9] drivers: scsi: fix double decrement of block count in 64-bit LBA path The scsi_read function incorrectly decrements the block count twice when handling large disks that trigger the CONFIG_SYS_64BIT_LBA code path (reads beyond block 268,435,455). The variable 'blks' was being decremented both inside the 64-bit LBA block and after the successful scsi_exec() call, causing incorrect block count tracking and data abort errors on large capacity disks. Signed-off-by: Balaji Selvanathan Tested-by: Tony Dinh --- drivers/scsi/scsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index b414d022f3f..8fe6b38a8c7 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -220,7 +220,6 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, pccb->datalen = block_dev->blksz * blocks; scsi_setup_read16(pccb, start, blocks); start += blocks; - blks -= blocks; } else #endif if (blks > max_blks) { From 0f6ff53d55ba254de8a995c2a2f5a313acd40ac7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Dec 2025 16:26:11 -0600 Subject: [PATCH 9/9] Prepare v2026.01-rc5 Signed-off-by: Tom Rini --- Makefile | 2 +- doc/develop/release_cycle.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 571c07e0e9c..8cb9a06f6a4 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 2026 PATCHLEVEL = 01 SUBLEVEL = -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc5 NAME = # *DOCUMENTATION* diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index be6b09b250e..2f4f5e4a845 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -79,7 +79,7 @@ For the next scheduled release, release candidates were made on: * U-Boot |next_ver|-rc4 was released on Mon 08 December 2025. -.. * U-Boot |next_ver|-rc5 was released on Tue 22 December 2025. +* U-Boot |next_ver|-rc5 was released on Mon 22 December 2025. Please note that the following dates are planned only and may be deviated from as needed.