From patchwork Sun Nov 5 18:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2249088vqu; Sun, 5 Nov 2023 10:11:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzHe744lyXSF7N1keewK5O5m4iJxg1sS1HFqGsNMF3U9MrAA59jqyIdTnuneMKOjdWWxeg X-Received: by 2002:a05:6870:238e:b0:1ea:7c8a:c9dc with SMTP id e14-20020a056870238e00b001ea7c8ac9dcmr30487627oap.26.1699207891087; Sun, 05 Nov 2023 10:11:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699207891; cv=none; d=google.com; s=arc-20160816; b=BCJqO166O5YTlhWlHpufLwK8/0putBm236ReWGqLpmtxrYY9tTk1XYxfLeS+6q+Iyk 1gw+IvaY7A/wFVkHn0gqGymqsCdeBJM97TIeX36jDbyLqLoiWZ2SKS4DJjiNzp/6676/ Uu3rKePSb6oaCj6AkpDc2BIZmTrit67gMf9qfWHT1lLUqsG1sKIQfKus6xEkZ1scLldv ulKtbgqT+hHjdV+8ckPIUScXP2z6adjop77rLYNTqECxn4hMt+CY+G2RTgbU2n2lijB3 CGVLlztkXGll+e/xt8odDIabVM/CpJnXnKWxhCsu95OZXtixydPp8OCPN7Tc01v75ZE4 EW5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Ndq6LZfKPU3m/lbZkGai/x/2/LADZDGOipNQXw58+b8=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=M/2cDJjZni4NZO0KrOOq+sRW/1Daci2ey6YRc77v0+r40HDwFPEJGUMIK+E9GLQxLw EJrwxrMehIxlHJhrAn3KCk4CMpVx5kQM7z2dUV/yyEGZ5SNI6h3jBVa0Ud2HkEz5EG4e l+yKRvo8dd9hIdzkhzDuwtLAtQyppTb1gAROQrZDhaeVMK0VeJeAbVMZAPoPSEtfQIHX VN8YH4lEPg8bOMUBlZ2senTnY5SCV9+TYfNqUU9wdbmPkebi4IdmiOJMLmkZXJzG9Hj1 R6pBJlfh6+waFw8c3gyPGNjY4ADibTzB43UC2v+dDO4L+465htWCI/VOKoWxvY1O6iuN k7oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FF199295; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id v64-20020a638943000000b005ad8009e304si6226835pgd.784.2023.11.05.10.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 10:11:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FF199295; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id BBDA88080D4A; Sun, 5 Nov 2023 10:11:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229519AbjKESLC (ORCPT + 34 others); Sun, 5 Nov 2023 13:11:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjKESLA (ORCPT ); Sun, 5 Nov 2023 13:11:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEA28DD; Sun, 5 Nov 2023 10:10:57 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E944DC433C7; Sun, 5 Nov 2023 18:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699207857; bh=mpoFT+sF50Go2QZkoZaiy6iHqvzaLfmudnHNvkJjZ0M=; h=From:To:Cc:Subject:Date:From; b=FF199295T+QngVfe3dCykm2QL3pOi50DD0yTbipcqRTQQMIzaCQERTqwE4jQ3C+cz vgVvm+MNjjXl4RgT2BTIXmECuI28soPzolp4Gj0GyV5njaVRNJvgH76ayat6spDTFe vZMqZEglfRJmpQv7PMZX6HAWAJK70OLWjrPWjt29hPkRzsjnOsfbcxlPXoY6cPgEdN eyZO+V9/rDXq8f2BpfNA0pIdDub7uNrd0UKReIpIf0UPb7zcrt6Y2YNYNTdeaZCIj6 zimS/UksCQiryMrjBQrpuJMZGq7DWVTxUxk3/J31LTpoG9fekkiA6aL+zD7bxhJlDr UzP0PfNHsTp5Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] kconfig: do not clear SYMBOL_DEF_USER when the value is out of range Date: Mon, 6 Nov 2023 03:10:47 +0900 Message-Id: <20231105181047.159441-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 05 Nov 2023 10:11:13 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781748613960109700 X-GMAIL-MSGID: 1781748613960109700 When a user-supplied value is out of range, (NEW) and an incorrect default value are shown. [Test Kconfig] config FOO int "foo" range 10 20 [Test .config] CONFIG_FOO=30 [Result without this fix] $ make config * * Main menu * foo (FOO) [10] (NEW) [Result with this fix] $ make config * * Main menu * foo (FOO) [20] Currently, the SYMBOL_DEF_USER is cleared if the user input does not reside within the range. Kconfig forgets the initial value 30, and prints (NEW) and an incorrect default [10]. Kconfig should remember the user's input. The default should be [20] because the user's input, 30, is closer to the upper limit of the range. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 4a6811d77d18..7fca9cc3ae74 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -594,7 +594,7 @@ int conf_read(const char *name) /* Reset a string value if it's out of range */ if (sym_string_within_range(sym, sym->def[S_DEF_USER].val)) break; - sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER); + sym->flags &= ~SYMBOL_VALID; conf_unsaved++; break; default: