diff options
author | M. Vefa Bicakci <m.v.b@runbox.com> | 2019-08-03 06:02:12 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-03 23:44:15 -0400 |
commit | 0c5b6c28ed68becb692b43eae5e44d5aa7e160ce (patch) | |
tree | c0325f0a0b1c7c5c60f2b7b7d07ab752f2ccde93 /scripts | |
parent | e8de12fb7cde2c85bc31097cd098da79a4818305 (diff) |
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.c | 4 |
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) | |||
848 | const char *str; | 848 | const char *str; |
849 | char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1]; | 849 | char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1]; |
850 | char *env; | 850 | char *env; |
851 | int i; | ||
851 | bool need_newline = false; | 852 | bool need_newline = false; |
852 | 853 | ||
853 | if (!name) | 854 | if (!name) |
@@ -930,6 +931,9 @@ next: | |||
930 | } | 931 | } |
931 | fclose(out); | 932 | fclose(out); |
932 | 933 | ||
934 | for_all_symbols(i, sym) | ||
935 | sym->flags &= ~SYMBOL_WRITTEN; | ||
936 | |||
933 | if (*tmpname) { | 937 | if (*tmpname) { |
934 | if (is_same(name, tmpname)) { | 938 | if (is_same(name, tmpname)) { |
935 | conf_message("No change to %s", name); | 939 | conf_message("No change to %s", name); |