Merge tag 'v2026.01-rc3' into next

Prepare v2026.01-rc3

2 files changed, 12 insertions, 14 deletions

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 038416203fc..836e4eb526c 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -444,7 +444,7 @@ static void label_boot_extension(struct pxe_context *ctx,
 	const struct extension *extension;
 	struct fdt_header *working_fdt;
 	struct alist *extension_list;
-	int ret, dir_len, len;
+	int ret, dir_len, len = 0;
 	char *overlay_dir;
 	const char *slash;
 	ulong fdt_addr;
@@ -472,18 +472,16 @@ static void label_boot_extension(struct pxe_context *ctx,
 			slash = "/";
 		else
 			slash = "";
-
-		dir_len = strlen(label->fdtdir) + strlen(slash) + 1;
-		overlay_dir = calloc(1, len);
-		if (!overlay_dir)
-			return;
-
-		snprintf(overlay_dir, dir_len, "%s%s", label->fdtdir,
-			 slash);
 	} else {
-		dir_len = 2;
-		snprintf(overlay_dir, dir_len, "/");
+		slash = "/";
 	}
+	dir_len = len + strlen(slash) + 1;
+
+	overlay_dir = calloc(1, dir_len);
+	if (!overlay_dir)
+		return;
+
+	snprintf(overlay_dir, dir_len, "%s%s", label->fdtdir ?: "", slash);
 
 	alist_for_each(extension, extension_list) {
 		char *overlay_file;
diff --git a/boot/upl_write.c b/boot/upl_write.c
index 7d637c15ba0..4185e59becf 100644
--- a/boot/upl_write.c
+++ b/boot/upl_write.c
@@ -301,7 +301,7 @@ static int add_upl_memory(const struct upl *upl, ofnode root)
 	for (i = 0; i < upl->mem.count; i++) {
 		const struct upl_mem *mem = alist_get(&upl->mem, i,
 						      struct upl_mem);
-		char buf[mem->region.count * sizeof(64) * 2];
+		char buf[mem->region.count * sizeof(u64) * 2];
 		const struct memregion *first;
 		char name[26];
 		int ret, len;
@@ -354,7 +354,7 @@ static int add_upl_memmap(const struct upl *upl, ofnode root)
 	for (i = 0; i < upl->memmap.count; i++) {
 		const struct upl_memmap *memmap = alist_get(&upl->memmap, i,
 							struct upl_memmap);
-		char buf[memmap->region.count * sizeof(64) * 2];
+		char buf[memmap->region.count * sizeof(u64) * 2];
 		const struct memregion *first;
 		char name[26];
 		int ret, len;
@@ -411,7 +411,7 @@ static int add_upl_memres(const struct upl *upl, ofnode root,
 	for (i = 0; i < upl->memres.count; i++) {
 		const struct upl_memres *memres = alist_get(&upl->memres, i,
 							struct upl_memres);
-		char buf[memres->region.count * sizeof(64) * 2];
+		char buf[memres->region.count * sizeof(u64) * 2];
 		const struct memregion *first;
 		char name[26];
 		int ret, len;