From: Guillaume Ranquet <ranquet.guillaume@gmail.com>
Date: Thu, 11 Sep 2025 13:35:41 +0000 (+0200)
Subject: x86: boot: fix unreachable else branch in boot_prep_linux
X-Git-Tag: v2026.04-rc2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb8a88e7ab7824b7dc857fb6572705f3e19c456;p=thirdparty%2Fu-boot.git

x86: boot: fix unreachable else branch in boot_prep_linux

The else if branch uses the is_zimage boolean which is initialized to 0
and never set before being tested here.

remove the test on is_zimage to make this code reachable.

Signed-off-by: Guillaume Ranquet <ranquet.guillaume@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 0827a884b1d..7a94dc877e3 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -103,7 +103,7 @@ static int boot_prep_linux(struct bootm_headers *images)
 		}
 		is_zimage = 1;
 #if defined(CONFIG_FIT)
-	} else if (images->fit_uname_os && is_zimage) {
+	} else if (images->fit_uname_os) {
 		ret = fit_image_get_data(images->fit_hdr_os,
 					 images->fit_noffset_os,
 					 (const void **)&data, &len);