From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56825C43444 for ; Tue, 8 Jan 2019 19:28:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B2362070B for ; Tue, 8 Jan 2019 19:28:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546975717; bh=e8IlupckPtBUD+8a3YHBDl0qfMRnd3VTioKWkHIT/ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RIYgrZ5BwKzrFEgYOO0+ydFTfpRXRFkz0xNJf0rYyl8O0XfqnkpagEdzTTl40ru4u cfFQjYanUJpBju1XphDgjfjlaX+WSE4FqFGneHl2XT/y32IoJ0l53uA49OXtw3uoIR CYyMi4Vlg1oHojSIFJr/qfPoSBY2zTp0b0ohj58w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730091AbfAHT2f (ORCPT ); Tue, 8 Jan 2019 14:28:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:35528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730040AbfAHT21 (ORCPT ); Tue, 8 Jan 2019 14:28:27 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 766DE2176F; Tue, 8 Jan 2019 19:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546975707; bh=e8IlupckPtBUD+8a3YHBDl0qfMRnd3VTioKWkHIT/ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5/Y0s/ZxGrTU0TSDkkZRcjBixf1/dUpYe7vyMZGgDRb3a3tixIdYeh0rOrNkI4+5 y/OffcEYEYu3j8pR4ZF4JW7Aqrs20CTWdXivGHf1n780jnYJopDIJTQlYxJpGHbrku 881kWoA/Yb4HlZ0gX3pDaaJMwypAEuXvQuleg/aE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 068/117] kconfig: fix memory leak when EOF is encountered in quotation Date: Tue, 8 Jan 2019 14:25:36 -0500 Message-Id: <20190108192628.121270-68-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190108192628.121270-1-sashal@kernel.org> References: <20190108192628.121270-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ 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 Signed-off-by: Sasha Levin --- scripts/kconfig/zconf.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index eeac64ccc730..c2f577d71964 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -221,6 +221,8 @@ n [A-Za-z0-9_-] } <> { BEGIN(INITIAL); + yylval.string = text; + return T_WORD_QUOTE; } } -- 2.19.1