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 2/3] kconfig: Fix expr_free() E_NOT leak
Date: Sun, 8 Oct 2017 19:35:45 +0200 [thread overview]
Message-ID: <1507484146-23617-3-git-send-email-ulfalizer@gmail.com> (raw)
In-Reply-To: <1507484146-23617-1-git-send-email-ulfalizer@gmail.com>
Only the E_NOT operand and not the E_NOT node itself was freed, due to
accidentally returning too early in expr_free(). Outline of leak:
switch (e->type) {
...
case E_NOT:
expr_free(e->left.expr);
return;
...
}
*Never reached, 'e' leaked*
free(e);
Fix by changing the 'return' to a 'break'.
Summary from Valgrind on 'menuconfig' (ARCH=x86) before the fix:
LEAK SUMMARY:
definitely lost: 44,448 bytes in 1,852 blocks
...
Summary after the fix:
LEAK SUMMARY:
definitely lost: 1,608 bytes in 67 blocks
...
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
---
scripts/kconfig/expr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index cbf4996..ed29bad 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -113,7 +113,7 @@ void expr_free(struct expr *e)
break;
case E_NOT:
expr_free(e->left.expr);
- return;
+ break;
case E_EQUAL:
case E_GEQ:
case E_GTH:
--
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 ` Ulf Magnusson [this message]
2017-10-08 17:35 ` [PATCH 3/3] kconfig: Fix choice symbol expression leak Ulf Magnusson
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-3-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