From a6732920821a23e00cc3291d8069061bd7d00e67 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Wed, 18 Jun 2025 15:43:44 +0200 Subject: MAINTAINERS: Add common/spl/spl_dfu to DFU entry This was not listed as part of the DFU entry. Add it to make sure that the DFU maintainers get CC'ed on patches for spl_dfu. Link: https://lore.kernel.org/r/20250618-maintainers-dfu-spl-v1-1-03f4bc745e36@kernel.org Signed-off-by: Mattijs Korpershoek --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 92119667618..d8cdd18fd52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1073,6 +1073,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git F: cmd/dfu.c F: cmd/usb_*.c F: common/dfu.c +F: common/spl/spl_dfu.c F: common/update.c F: doc/api/dfu.rst F: doc/usage/dfu.rst -- cgit v1.3.1 From 4b9717c6868f2f98b02fbe87a885cfa48a5b9946 Mon Sep 17 00:00:00 2001 From: Andrew Goodbody Date: Thu, 26 Jun 2025 17:38:54 +0100 Subject: cmd: abootimg: Prevent use of unintialised variable Initialise vhdr to prevent its use when uninitialised. This issue was found with Smatch. Fixes: 636da2039aea (android: boot: support boot image header version 3 and 4) Signed-off-by: Andrew Goodbody Link: https://lore.kernel.org/r/20250625-abootimg_fix-v4-1-df7af00e87b0@linaro.org [mkorpershoek: fixed trivial typo in commit msg] Signed-off-by: Mattijs Korpershoek --- cmd/abootimg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/abootimg.c b/cmd/abootimg.c index 44de00fb9c9..6fb52153786 100644 --- a/cmd/abootimg.c +++ b/cmd/abootimg.c @@ -96,7 +96,7 @@ static int abootimg_get_dtb_load_addr(int argc, char *const argv[]) return CMD_RET_USAGE; struct andr_image_data img_data = {0}; const struct andr_boot_img_hdr_v0 *hdr; - const struct andr_vnd_boot_img_hdr *vhdr; + const struct andr_vnd_boot_img_hdr *vhdr = NULL; hdr = map_sysmem(abootimg_addr(), sizeof(*hdr)); if (get_avendor_bootimg_addr() != -1) -- cgit v1.3.1 From 4b489f517366595cd3f003d4175e721bd927a18b Mon Sep 17 00:00:00 2001 From: Andrew Goodbody Date: Thu, 26 Jun 2025 17:38:55 +0100 Subject: boot: android: Prevent use of unintialised variable Initialise vhdr to prevent its use when uninitialised. This issue was found with Smatch. Fixes: e058176be32b (android: boot: add vendor boot image to prepare for v3, v4 support) Signed-off-by: Andrew Goodbody Reviewed-by: Mattijs Korpershoek Link: https://lore.kernel.org/r/20250625-abootimg_fix-v4-2-df7af00e87b0@linaro.org Signed-off-by: Mattijs Korpershoek --- boot/image-android.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/image-android.c b/boot/image-android.c index 14cf611cee5..1cd2060bb3f 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -680,7 +680,7 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, ulong vendor_boot_img, { struct andr_image_data img_data; const struct andr_boot_img_hdr_v0 *hdr; - const struct andr_vnd_boot_img_hdr *vhdr; + const struct andr_vnd_boot_img_hdr *vhdr = NULL; hdr = map_sysmem(hdr_addr, sizeof(*hdr)); if (vendor_boot_img != -1) -- cgit v1.3.1