From a8a81af848b88d7ecee64d98a08f6415630305b3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 1 Dec 2025 16:17:24 +0100 Subject: 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(-) (limited to 'cmd') 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; -- cgit v1.2.3 From 2333d446b7b133ddfb9dea2d53996d560796ecd9 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 17 Dec 2025 20:57:38 +0100 Subject: 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(+) (limited to 'cmd') 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 -- cgit v1.2.3 From f26db83ca964e81d7f2b3c2c984afdb8bb104678 Mon Sep 17 00:00:00 2001 From: Brian Sune Date: Mon, 22 Dec 2025 22:27:44 +0800 Subject: 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(-) (limited to 'cmd') 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. -- cgit v1.2.3