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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 B1481C282C5 for ; Thu, 24 Jan 2019 19:28:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8320A218A6 for ; Thu, 24 Jan 2019 19:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358080; bh=OQx3F/WlbRfkgK6s5YVXihIbrWbE+wANmVbwprnWGzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=J7EOcEqoVJ+s8iYcJIe3WOuVtKP3ALr97AWRwa03AWOikMIOLYnIuJJCUdrbGir9h LTE7toNrVIvWEOIL4TppwEtbwpRSQp1mE7LtG5b22YXmGKaMos9t6bwG1Xh8r5hMhy +V9p/hGB0dqL5jJTgs4uFZOVdCn6prlsU0PgxsyI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730859AbfAXT17 (ORCPT ); Thu, 24 Jan 2019 14:27:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:54274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728590AbfAXT14 (ORCPT ); Thu, 24 Jan 2019 14:27:56 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D9AAF218A6; Thu, 24 Jan 2019 19:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358075; bh=OQx3F/WlbRfkgK6s5YVXihIbrWbE+wANmVbwprnWGzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X3OCE/wLKG0HoQ2ABSz4CGM3mejwgbaaHMunbe82nqeSH3ThKVUYdd+kW4HQ6Cabf mWOP5fr+XjwJzuMDzbIoo6YJTwy8QRUOui1mDnhnqhVhY3p982AiF+jC9Aw+mNkMnv 5LKfJ7vlcXx1ZbTs5DiOG/ItMlnFvyB8vpl1P6+Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Sasha Levin Subject: [PATCH 4.4 090/104] kconfig: fix memory leak when EOF is encountered in quotation Date: Thu, 24 Jan 2019 20:20:19 +0100 Message-Id: <20190124190204.820592412@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 6534dc5ac803..0c7800112ff5 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -191,6 +191,8 @@ n [A-Za-z0-9_-] } <> { BEGIN(INITIAL); + yylval.string = text; + return T_WORD_QUOTE; } } -- 2.19.1