From patchwork Mon Aug 5 05:35:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 170524 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp3822356ile; Sun, 4 Aug 2019 22:35:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgB2gf5Uv9Uo/KPaPEdIh2hx39y4BkLdap7jLfZz9NwAUNyQyVtHQTJcsUDjiuPKmBYhgj X-Received: by 2002:a63:550e:: with SMTP id j14mr26974752pgb.302.1564983351161; Sun, 04 Aug 2019 22:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564983351; cv=none; d=google.com; s=arc-20160816; b=Q8p3ClMyxbzNe19eNDSKTuyGZNWmvwaQ6DOHeHHa503aTrZlOfR49TrZGzeRz8anMD 1+zo5e6yhePKAITPuXh1iDuOTGcMzMPZtBs3+wY7uH0fsKIb9/VjeuasyBmkhjktj1TN 5J1LJ1TuQbWbx9+ytDGhDDvH4Cb6nacI0UiGYqsbkqbuOwOQj+608DLwAXSvwO7T8xL8 D26mqchiLjO1/gsh2gZ2Bhq1352odnuqAh21vtyK0rExW6pgTZGntYpoY9G5HqqYPlTC +Q2VYNJpIlZqj2sWzS0DLbUXaK2HwfXSA5ec3qwus16rKxjHyVv+44l11HG8NmtYNEt3 AkFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=TbK6VAq503EXh72UIZZuMWC50YcF7dIdIDwOWGY2OTM=; b=dLxo2kK2ZdAeIbRiJtj/to6hGhgCTXaz8h/+mQUbhpyvZ9+7kwJYWGR91oxEre4QYa JVBIk3/cn6iOLZoYjt+Mgp2axXlGQZVPtatzie0n7vJ8qeR1nlK1iDOClvxqBPOXflOR sevj+NdDVYZ0fbncEHPrcgqE/OJmehn2k5mg0YkXL7AFPfS6ohtBQpAshMmSBjGrKMT/ FyIRw+MwtV2zojOyl6vtKflVf3bIoh9iTc9qdrReQ97JQtHSCapTzk3ydBW/moY71UV3 wgahziV6P+FSHEQqBDin4F9QWuSGMdNDIYTvfTxWGd71NmwDMSelqAtiUKw0r6OXHsP4 I6mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ZNLrWcTU; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m17si12720268pgc.461.2019.08.04.22.35.50; Sun, 04 Aug 2019 22:35:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ZNLrWcTU; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725992AbfHEFfu (ORCPT + 14 others); Mon, 5 Aug 2019 01:35:50 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:40589 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725951AbfHEFfu (ORCPT ); Mon, 5 Aug 2019 01:35:50 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x755ZJ7s024705; Mon, 5 Aug 2019 14:35:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x755ZJ7s024705 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564983320; bh=TbK6VAq503EXh72UIZZuMWC50YcF7dIdIDwOWGY2OTM=; h=From:To:Cc:Subject:Date:From; b=ZNLrWcTUu39C3VwvDAAnePg8O1iS4uTO+rxAC3nwLyQV9e4M8gqQOf2O/LfKDJ2g1 LskI7ynF7xfL1mAkg4FaIsnYSfzO+SAaQldPouOfeG3MmnhifyNip5yMBTS0Z++Jvw mIfxqtqYB6/6A+7SRtUR/IOl8nXRZ6BFGlYLcae1tAfJXL9Ygh2aZSJMVtu9KVkaod oi+Grcw2Av38lEK38FTtNRymVWL8IGn7pLjEBAHijhtKD8kLpoRIDJYiZzvnq49IHH 8bW3S7u2UOQPLulBZ/5DcyOQQ7m6eL/4XvnW+JQnd7jCCPTIX6221Hxzln5yFlxLkA Wy7mxp8Jha6bw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Greg KH , Sasha Levin , linux-stable Cc: Masahiro Yamada , Masahiro Yamada , "M. Vefa Bicakci" Subject: [PATCH 5.1.x] kconfig: Clear "written" flag to avoid data loss Date: Mon, 5 Aug 2019 14:35:13 +0900 Message-Id: <20190805053513.29629-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "M. Vefa Bicakci" commit 0c5b6c28ed68becb692b43eae5e44d5aa7e160ce upstream. 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 # 4.19+ Signed-off-by: M. Vefa Bicakci Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index fd99ae90a618..0dde19cf7486 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -784,6 +784,7 @@ int conf_write(const char *name) const char *str; char dirname[PATH_MAX+1], tmpname[PATH_MAX+22], newname[PATH_MAX+8]; char *env; + int i; dirname[0] = 0; if (name && name[0]) { @@ -860,6 +861,9 @@ int conf_write(const char *name) } fclose(out); + for_all_symbols(i, sym) + sym->flags &= ~SYMBOL_WRITTEN; + if (*tmpname) { strcat(dirname, basename); strcat(dirname, ".old");