Commit 466de918 authored Mar 19, 2011 by Ben Hutchings Committed by Michal Marek Apr 08, 2011

kconfig: Avoid buffer underrun in choice input



commit 40aee729 ('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 <ben@decadent.org.uk>
Cc: stable@kernel.org [2.6.17+]
Signed-off-by: Michal Marek <mmarek@suse.cz>

parent 0ce790e7

scripts/kconfig/conf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ static int conf_choice(struct menu *menu)
		}
		if (!child)
		continue;
		if (line[strlen(line) - 1] == '?') {
		if (line[0] && line[strlen(line) - 1] == '?') {
		print_help(child);
		continue;
		}

Admin message