aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-05-07 05:37:45 -0700
committerMichal Marek <mmarek@suse.cz>2012-05-07 20:51:06 +0200
commit9f420bf0f4a74e404b73b42b7fc3c85c20c64ea7 (patch)
treee59051965038efc83573767977937cfbac6d7d12 /scripts
parentkconfig: Add error handling to KCONFIG_ALLCONFIG (diff)
downloadlinux-dev-9f420bf0f4a74e404b73b42b7fc3c85c20c64ea7.tar.xz
linux-dev-9f420bf0f4a74e404b73b42b7fc3c85c20c64ea7.zip
kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.
Prevent subtle surprises to both people working on the kconfig code and people using make allnoconfig allyesconfig allmoconfig and randconfig by only attempting to read a config file if KCONFIG_ALLCONFIG is set. Common sense suggests attempting to read the extra config files does not make sense unless requested. The documentation says the code won't attempt to read the extra config files unless requested. Current usage does not appear to include people depending on the code reading the config files without the variable being set So do the simple thing and stop reading config files when passed all{no,yes,mod,def,rand}config unless KCONFIG_ALLCONFIG environment variable is set. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/conf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 0fdda9169308..0dc4a2c779b1 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -574,7 +574,9 @@ int main(int ac, char **av)
case alldefconfig:
case randconfig:
name = getenv("KCONFIG_ALLCONFIG");
- if (name && (strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+ if (!name)
+ break;
+ if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
if (conf_read_simple(name, S_DEF_USER)) {
fprintf(stderr,
_("*** Can't read seed configuration \"%s\"!\n"),