summaryrefslogtreecommitdiff
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 11:00:45 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-26 08:38:34 (GMT)
commit4f67ca0965e62df8c8be9bf2893a43327a8b3f66 (patch)
treeea1b3964724e371fc004eae5f38601b8457431e0
parent7ff335ee509d50a77a626aef22413d6b02994625 (diff)
downloadcommon-4f67ca0965e62df8c8be9bf2893a43327a8b3f66.zip
common-4f67ca0965e62df8c8be9bf2893a43327a8b3f66.tar.gz
common-4f67ca0965e62df8c8be9bf2893a43327a8b3f66.tar.bz2
kconfig: fix memory leak when EOF is encountered in quotation
[ Upstream commit fbac5977d81cb2b2b7e37b11c459055d9585273c ] An unterminated string literal followed by new line is passed to the parser (with "multi-line strings not supported" warning shown), then handled properly there. On the other hand, an unterminated string literal at end of file is never passed to the parser, then results in memory leak. [Test Code] ----------(Kconfig begin)---------- source "Kconfig.inc" config A bool "a" -----------(Kconfig end)----------- --------(Kconfig.inc begin)-------- config B bool "b\No new line at end of file ---------(Kconfig.inc end)--------- [Summary from Valgrind] Before the fix: LEAK SUMMARY: definitely lost: 16 bytes in 1 blocks ... After the fix: LEAK SUMMARY: definitely lost: 0 bytes in 0 blocks ... Eliminate the memory leak path by handling this case. Of course, such a Kconfig file is wrong already, so I will add an error message later. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat
-rw-r--r--scripts/kconfig/zconf.l2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 6534dc5..0c78001 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -191,6 +191,8 @@ n [A-Za-z0-9_-]
}
<<EOF>> {
BEGIN(INITIAL);
+ yylval.string = text;
+ return T_WORD_QUOTE;
}
}