From: Ulf Magnusson <ulfalizer@gmail.com>
To: yann.morin.1998@free.fr, linux-kbuild@vger.kernel.org
Cc: sam@ravnborg.org, zippel@linux-m68k.org,
nicolas.pitre@linaro.org, michal.lkml@markovi.net,
dirk@gouders.net, yamada.masahiro@socionext.com,
lacombar@gmail.com, walch.martin@web.de, JBeulich@suse.com,
linux-kernel@vger.kernel.org, Ulf Magnusson <ulfalizer@gmail.com>
Subject: [PATCH 3/3] kconfig: Fix choice symbol expression leak
Date: Sun, 8 Oct 2017 19:35:46 +0200 [thread overview]
Message-ID: <1507484146-23617-4-git-send-email-ulfalizer@gmail.com> (raw)
In-Reply-To: <1507484146-23617-1-git-send-email-ulfalizer@gmail.com>
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 <ulfalizer@gmail.com>
---
| 4 ++++
1 file changed, 4 insertions(+)
--git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 749c2bd..e0badd9 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -344,6 +344,10 @@ void menu_finalize(struct menu *parent)
}
}
}
+
+ if (sym && sym_is_choice(sym))
+ expr_free(parentdep);
+
for (menu = parent->list; menu; menu = menu->next)
menu_finalize(menu);
} else if (sym) {
--
2.7.4
next prev parent reply other threads:[~2017-10-08 17:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-08 17:35 [PATCH 0/3] kconfig: Fix expression memory leaks Ulf Magnusson
2017-10-08 17:35 ` [PATCH 1/3] kconfig: Fix automatic menu creation mem leak Ulf Magnusson
2017-10-08 17:35 ` [PATCH 2/3] kconfig: Fix expr_free() E_NOT leak Ulf Magnusson
2017-10-08 17:35 ` Ulf Magnusson [this message]
2018-01-11 15:28 ` [PATCH 0/3] kconfig: Fix expression memory leaks 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=1507484146-23617-4-git-send-email-ulfalizer@gmail.com \
--to=ulfalizer@gmail.com \
--cc=JBeulich@suse.com \
--cc=dirk@gouders.net \
--cc=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=nicolas.pitre@linaro.org \
--cc=sam@ravnborg.org \
--cc=walch.martin@web.de \
--cc=yamada.masahiro@socionext.com \
--cc=yann.morin.1998@free.fr \
--cc=zippel@linux-m68k.org \
/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