From: Andrew Goodbody <andrew.goodbody@linaro.org>
Date: Mon, 30 Jun 2025 11:57:10 +0000 (+0100)
Subject: boot: pxe: Prevent evaluation of uninitialised variable
X-Git-Tag: v2025.10-rc1~120
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3b43eeaead77beef53a224c7d13346a0462b34d;p=thirdparty%2Fu-boot.git

boot: pxe: Prevent evaluation of uninitialised variable

In the case where parse_sliteral returns an error then label_name
will not have been assigned to. In order to prevent evaluating
label_name in this case add a check for the return value of parse_sliteral.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
---

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 82f217aaf86..eb4d7723481 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -1348,7 +1348,7 @@ static int parse_pxefile_top(struct pxe_context *ctx, char *p, unsigned long bas
 		case T_ONTIMEOUT:
 			err = parse_sliteral(&p, &label_name);
 
-			if (label_name) {
+			if (err >= 0 && label_name) {
 				if (cfg->default_label)
 					free(cfg->default_label);
 
@@ -1360,7 +1360,7 @@ static int parse_pxefile_top(struct pxe_context *ctx, char *p, unsigned long bas
 		case T_FALLBACK:
 			err = parse_sliteral(&p, &label_name);
 
-			if (label_name) {
+			if (err >= 0 && label_name) {
 				if (cfg->fallback_label)
 					free(cfg->fallback_label);