diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-04-23 18:42:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-24 08:24:31 -0700 |
| commit | 3ba41621156681afcdbcd624e3191cbc65eb94f4 (patch) | |
| tree | 197b021d9da6cf693fb6b80524e73e228b0bd589 | |
| parent | 686c4cbb10fc0e75b29b097290b4f7fc3f010b9e (diff) | |
| download | linux-3.10-3ba41621156681afcdbcd624e3191cbc65eb94f4.tar.gz linux-3.10-3ba41621156681afcdbcd624e3191cbc65eb94f4.tar.bz2 linux-3.10-3ba41621156681afcdbcd624e3191cbc65eb94f4.zip | |
kconfig: Avoid buffer underrun in choice input
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 <ben@decadent.org.uk>
Cc: stable@kernel.org [2.6.17+]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | scripts/kconfig/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 659326c3e89..006ad817cd5 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -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; } |