Skip to content

Commit 191b090

Browse files
bwhacksKali-
authored andcommitted
kconfig: Avoid buffer underrun in choice input
commit 3ba41621156681afcdbcd624e3191cbc65eb94f4 upstream. Commit 40aee729b350 ('kconfig: fix default value for choice input') fixed some cases where kconfig would select the wrong option from a choice with a single valid option and thus enter an infinite loop. However, this broke the test for user input of the form 'N?', because when kconfig selects the single valid option the input is zero-length and the test will read the byte before the input buffer. If this happens to contain '?' (as it will in a mips build on Debian unstable today) then kconfig again enters an infinite loop. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]>
1 parent 01c11e4 commit 191b090

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/kconfig/conf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static int conf_choice(struct menu *menu)
330330
}
331331
if (!child)
332332
continue;
333-
if (line[strlen(line) - 1] == '?') {
333+
if (line[0] && line[strlen(line) - 1] == '?') {
334334
print_help(child);
335335
continue;
336336
}

0 commit comments

Comments
 (0)