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>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/config/confdata.c b/config/confdata.c
index b81ebe64b2b44705685253dbd65bdeb0e7869aef..a124a25e899fde96872ff0a9952e079070339d44 100644 (file)
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -894,6 +894,7 @@ int conf_write(const char *name)
        const char *str;
        char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
        char *env;
        const char *str;
        char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
        char *env;

+       int i;

        bool need_newline = false;
 
        if (!name)
        bool need_newline = false;
 
        if (!name)


@@ -976,6 +977,9 @@ next:
        }
        fclose(out);
 
        }
        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);
        if (*tmpname) {
                if (is_same(name, tmpname)) {
                        conf_message("No change to %s", name);