From 66f295a0e38d549f4b04a3ff7068586fb8216e24 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Sun, 8 Oct 2017 19:35:46 +0200 Subject: [PATCH] kconfig: Fix choice symbol expression leak When propagating dependencies from parents after parsing, an expression node is allocated if the parent symbol is a 'choice'. This node was never freed. Outline of leak: if (sym && sym_is_choice(sym)) { ... *Allocate (in this case only)* parentdep = expr_alloc_symbol(sym); } else if (parent->prompt) parentdep = parent->prompt->visible.expr; else parentdep = parent->dep; for (menu = parent->list; menu; menu = menu->next) { ... *Copy* basedep = expr_alloc_and(expr_copy(parentdep), basedep); ... } *parentdep lost if the parent is a choice!* Fix by freeing 'parentdep' after the loop if the parent symbol is a choice. Note that this only frees the expression node and not the choice symbol itself. Summary from Valgrind on 'menuconfig' (ARCH=x86) before the fix: LEAK SUMMARY: definitely lost: 1,608 bytes in 67 blocks ... Summary after the fix: LEAK SUMMARY: definitely lost: 0 bytes in 0 blocks ... Signed-off-by: Ulf Magnusson Signed-off-by: Masahiro Yamada Signed-off-by: Christian Lamparter --- config/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/menu.c b/config/menu.c index 5b24159..41c79be 100644 --- a/config/menu.c +++ b/config/menu.c @@ -408,6 +408,9 @@ void menu_finalize(struct menu *parent) } } + if (sym && sym_is_choice(sym)) + expr_free(parentdep); + /* * Recursively process children in the same fashion before * moving on -- 2.31.1