boot: Fix OOB reads in conf/osrel parsing

medhefgo · bluca · commit bee5c6be6f40 · 2023-11-10T00:22:41.000Z
(cherry picked from commit 5ce851a) (cherry picked from commit 99234b9) (cherry picked from commit 8626142)
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
@@ -1141,7 +1141,7 @@ static char *line_get_key_value(
                 line[linelen] = '\0';
 
                 /* remove leading whitespace */
-                while (strchr8(" \t", *line)) {
+                while (linelen > 0 && strchr8(" \t", *line)) {
                         line++;
                         linelen--;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ static char *line_get_key_value(`
`1141`	`1141`	`line[linelen] = '\0';`
`1142`	`1142`
`1143`	`1143`	`/* remove leading whitespace */`
`1144`		`- while (strchr8(" \t", *line)) {`
	`1144`	`+ while (linelen > 0 && strchr8(" \t", *line)) {`
`1145`	`1145`	`line++;`
`1146`	`1146`	`linelen--;`
`1147`	`1147`	`}`