summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorM. Vefa Bicakci <m.v.b@runbox.com>2019-08-03 06:02:12 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-08-04 12:44:15 +0900
commit0c5b6c28ed68becb692b43eae5e44d5aa7e160ce (patch)
treec0325f0a0b1c7c5c60f2b7b7d07ab752f2ccde93 /scripts
parente8de12fb7cde2c85bc31097cd098da79a4818305 (diff)
downloadlinux-0c5b6c28ed68becb692b43eae5e44d5aa7e160ce.tar.gz
linux-0c5b6c28ed68becb692b43eae5e44d5aa7e160ce.tar.bz2
linux-0c5b6c28ed68becb692b43eae5e44d5aa7e160ce.zip
kconfig: Clear "written" flag to avoid data loss
Prior to this commit, starting nconfig, xconfig or gconfig, and saving the .config file more than once caused data loss, where a .config file that contained only comments would be written to disk starting from the second save operation. This bug manifests itself because the SYMBOL_WRITTEN flag is never cleared after the first call to conf_write, and subsequent calls to conf_write then skip all of the configuration symbols due to the SYMBOL_WRITTEN flag being set. This commit resolves this issue by clearing the SYMBOL_WRITTEN flag from all symbols before conf_write returns. Fixes: 8e2442a5f86e ("kconfig: fix missing choice values in auto.conf") Cc: linux-stable <stable@vger.kernel.org> # 4.19+ Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/confdata.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 1134892599da..3569d2dec37c 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -848,6 +848,7 @@ int conf_write(const char *name)
const char *str;
char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
char *env;
+ int i;
bool need_newline = false;
if (!name)
@@ -930,6 +931,9 @@ next:
}
fclose(out);
+ for_all_symbols(i, sym)
+ sym->flags &= ~SYMBOL_WRITTEN;
+
if (*tmpname) {
if (is_same(name, tmpname)) {
conf_message("No change to %s", name);