kconfig: forbid multiple entries with the same symbol in a choice
PATCH 1/1 kconfig: forbid multiple entries with the same symbol in a choice
Commit 6a859f1a19d1 ("powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block") removed the only occurrence of this tricky use case.
Disallow this pattern in choice_check_sanity() and revert commit 4d46b5b623e0 ("kconfig: fix infinite loop in sym_calc_choice()").
---
scripts/kconfig/parser.y | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
scripts/kconfig/parser.y +4 -11
@@ -159,14 +159,8 @@ config_stmt: config_entry_start config_option_list yynerrs++; } - /* - * If the same symbol appears twice in a choice block, the list - * node would be added twice, leading to a broken linked list. - * list_empty() ensures that this symbol has not yet added. - */ - if (list_empty(¤t_entry->sym->choice_link)) - list_add_tail(¤t_entry->sym->choice_link, - ¤t_choice->choice_members); + list_add_tail(¤t_entry->sym->choice_link, + ¤t_choice->choice_members); } printd(DEBUG_PARSE, "%s:%d:endconfig\n", cur_filename, cur_lineno);
@@ -546,11 +540,10 @@ static int choice_check_sanity(const struct menu *menu) ret = -1; } - if (prop->menu != menu && prop->type == P_PROMPT && - prop->menu->parent != menu->parent) { + if (prop->menu != menu && prop->type == P_PROMPT) { fprintf(stderr, "%s:%d: error: %s", prop->filename, prop->lineno, - "choice value has a prompt outside its choice group\n"); + "choice value must not have a prompt in another entry\n"); ret = -1; } }
Signature · 1 line
2.43.0
Quoted 8 lines · Masahiro Yamada
Commit
6a859f1a19d1("powerpc: unify twoCONFIG_POWERPC64_CPUentries in the same choice block") removed the only occurrence of this tricky use case.Disallow this pattern in
choice_check_sanity()and revert commit4d46b5b623e0("kconfig: fix infinite loop insym_calc_choice()").Signed-off-by Masahiro Yamada <[email protected]>
Yeah, definitely seems like a reasonable restriction.
Quoted 43 lines
---
scripts/kconfig/parser.y | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)scripts/kconfig/parser.y +4
-11@@ -159,14 +159,8 @@ config_stmt: config_entry_start config_option_list yynerrs++; } - /* - * If the same symbol appears twice in a choice block, the list - * node would be added twice, leading to a broken linked list. - * list_empty() ensures that this symbol has not yet added. - */ - if (list_empty(¤t_entry->sym->choice_link)) - list_add_tail(¤t_entry->sym->choice_link, - ¤t_choice->choice_members); + list_add_tail(¤t_entry->sym->choice_link, + ¤t_choice->choice_members); } printd(DEBUG_PARSE, "%s:%d:endconfig\n", cur_filename, cur_lineno);@@ -546,11 +540,10 @@ static int choice_check_sanity(const struct menu *menu) ret = -1; } - if (prop->menu != menu && prop->type == P_PROMPT && - prop->menu->parent != menu->parent) { + if (prop->menu != menu && prop->type == P_PROMPT) { fprintf(stderr, "%s:%d: error: %s", prop->filename, prop->lineno, - "choice value has a prompt outside its choice group\n"); + "choice value must not have a prompt in another entry\n"); ret = -1; } }Signature · 1 line
2.43.0
Nicolas Schier
maintainerQuoted 8 lines · Masahiro Yamada
Commit
6a859f1a19d1("powerpc: unify twoCONFIG_POWERPC64_CPUentries in the same choice block") removed the only occurrence of this tricky use case.Disallow this pattern in
choice_check_sanity()and revert commit4d46b5b623e0("kconfig: fix infinite loop insym_calc_choice()").[...]
Applied to kbuild/linux.git (kbuild-next-unstable), thanks!
[1/1] kconfig: forbid multiple entries with the same symbol in a choice
https://git.kernel.org/kbuild/c/e967588a
Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped, reverted or modified (e.g. trailers). Patches applied to the kbuild-next-unstable branch are accepted pending wider testing in linux-next and any post-commit review; they will generally be moved to the kbuild-next branch in about a week if no issues are found.
Best regards,
Signature · 1 line
Nicolas