Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2529488imm; Mon, 28 May 2018 09:49:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqyWOqdnpDpqh/9K1gjpp/I+NJZnMGxTS8N9wCaTL+6SFZK4ZB/WKZW1LyEkpPXklKa3fAa X-Received: by 2002:a17:902:b08f:: with SMTP id p15-v6mr14065818plr.36.1527526187104; Mon, 28 May 2018 09:49:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527526187; cv=none; d=google.com; s=arc-20160816; b=ha3LbZYE+ORmnVAw+zf3rikksi2cp1Ox0aC//7tj3JVp2U37ud4spn/iNWhyK9XWk3 apOilDAo5+ns9tI2DhsCLS0NhSEKgThRDUqnP32/Y5WtHb4wVK0xvG7GGw0mGnsHUZPs h+oEVO4wy5EOY6XtOn8KFoJx4NFXAwkU4xR4nkBHyoGOi7WHffZyznoUUJN2EBq9VOTR vCYWcDE3dW2XE6OpzM3ctHz5NdB5Rfwm2wdwC+2pn+YXqyNMdTwN+QTv/+HXhv66hcVW pHjaNPgNtY84v7asnUtWdsJ0NWmfM07/rYcYUvxH+aZjuunt3G0FjxRHkpo5dX9Qtc6B 7dQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Gye43iPJtyMBz/BYXN2ydZfN7+2b/7cQbJRzl3ZAXrI=; b=xqo4Lu/O5iLD2ct5X82ETYSvZ4iXBcOcHyS+RG68PeCZqfEYVHb8O8x8VkjkFC3Ll4 lis/eV2tYm7K0foS3QmXf6eRYS4w2inEiXwKaNf7OpNbLxadwmpmH1S74BHIY6LIzi74 uErzPv/tyb9vJ51f8pZ1heejWbm9xgsmCVny3z/AJ2/c19Ym2fWigSWRNOFUqzeYlZwM hhsGaIb8jTj9Vhy5CQXZXrkHtE61mxpeaZlpNjKax4KtZzL+DX+r/Ct3+5n3X4BYxshT 27Y/SvAkBKhJrm/cvJG0JRHqhZxn8AaQJV+28UhvAsEWbmOduEJJyAWrcA5ixIsrK+Tc mk5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H3WvBBF5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j2-v6si11503977pll.411.2018.05.28.09.49.32; Mon, 28 May 2018 09:49:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H3WvBBF5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585AbeE1KGc (ORCPT + 99 others); Mon, 28 May 2018 06:06:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:54408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754566AbeE1KG2 (ORCPT ); Mon, 28 May 2018 06:06:28 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 3CF9020899; Mon, 28 May 2018 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527501987; bh=qgn2D2aRAZyDjmovrQIo279q3RMI6rIoOTxc710h6Ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H3WvBBF5bropYnQjY4M2A8SBIoA25jFrvAS00XYM21SDd0aIp7Kh7bMaMeOtVHHnU HfwBg20qOqImA9yJUm6+BNMAGBAyiJ9zJDKPRbajlVzl/JFW1l7seTSDT+e7zVocnM 2qe+2S/Yfmhag9tS8DP4+xaPBg5t7nXMfullZSso= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ulf Magnusson , Masahiro Yamada , Sasha Levin Subject: [PATCH 3.18 020/185] kconfig: Fix automatic menu creation mem leak Date: Mon, 28 May 2018 12:01:01 +0200 Message-Id: <20180528100051.771851506@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100050.700971285@linuxfoundation.org> References: <20180528100050.700971285@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ulf Magnusson [ Upstream commit ae7440ef0c8013d68c00dad6900e7cce5311bb1c ] expr_trans_compare() always allocates and returns a new expression, giving the following leak outline: ... *Allocate* basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no); ... for (menu = parent->next; menu; menu = menu->next) { ... *Copy* dep2 = expr_copy(basedep); ... *Free copy* expr_free(dep2); } *basedep lost!* Fix by freeing 'basedep' after the loop. Summary from Valgrind on 'menuconfig' (ARCH=x86) before the fix: LEAK SUMMARY: definitely lost: 344,376 bytes in 14,349 blocks ... Summary after the fix: LEAK SUMMARY: definitely lost: 44,448 bytes in 1,852 blocks ... Signed-off-by: Ulf Magnusson Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- scripts/kconfig/menu.c | 1 + 1 file changed, 1 insertion(+) --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -364,6 +364,7 @@ void menu_finalize(struct menu *parent) menu->parent = parent; last_menu = menu; } + expr_free(basedep); if (last_menu) { parent->list = parent->next; parent->next = last_menu->next;