From: "M. Vefa Bicakci" <m.v.b@runbox.com>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "Joonas Kylmälä" <joonas.kylmala@iki.fi>,
"Ulf Magnusson" <ulfalizer@gmail.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Kbuild mailing list" <linux-kbuild@vger.kernel.org>,
linux-stable <stable@vger.kernel.org>,
"M. Vefa Bicakci" <m.v.b@runbox.com>
Subject: [PATCH v2] kconfig: Clear "written" flag to avoid data loss
Date: Sat, 3 Aug 2019 06:02:12 -0400 [thread overview]
Message-ID: <20190803100212.8227-1-m.v.b@runbox.com> (raw)
In-Reply-To: <CAK7LNASPib2GUgjUEwmNYcO9_NgvjyjKSpqwJVZSNhFOJ7Lkfw@mail.gmail.com>
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>
---
Changes since v1:
* As suggested by Masahiro Yamada, instead of defining a new helper
function to traverse over all symbols in a pre-defined order, use
the for_all_symbols iterator.
---
scripts/kconfig/confdata.c | 4 ++++
1 file changed, 4 insertions(+)
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 @@ int conf_write(const char *name)
}
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);
--
2.21.0
next prev parent reply other threads:[~2019-08-03 10:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 6:07 [PATCH] kconfig: fix missing choice values in auto.conf Masahiro Yamada
2019-07-12 10:59 ` Joonas Kylmälä
2019-08-02 23:52 ` M. Vefa Bicakci
2019-08-03 2:32 ` Masahiro Yamada
2019-08-03 10:02 ` M. Vefa Bicakci [this message]
2019-08-04 3:50 ` [PATCH v2] kconfig: Clear "written" flag to avoid data loss Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190803100212.8227-1-m.v.b@runbox.com \
--to=m.v.b@runbox.com \
--cc=joonas.kylmala@iki.fi \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=ulfalizer@gmail.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).