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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 199C7C10F14 for ; Thu, 3 Oct 2019 16:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFABC20700 for ; Thu, 3 Oct 2019 16:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118600; bh=ZXx/rLq0nk9f0Ahs2K5n+bICEAILjbx/fuHqecPZgMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GxCuM05BDMR96oQZNcFJ+u7fkH4Owk+1utjf2I/O3Mc507exIT8cQM5P9yJQFeBVv dWn/MLztdTRbHTho62kxtobNJgT7KF3w72WqBDqEsbKS7KBwWWK9F6108rfyY6EawO +XMJTg+FJko6R5BAFGEJIcArc0E0qVIbqAPU6Um8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731043AbfJCQDT (ORCPT ); Thu, 3 Oct 2019 12:03:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:48576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732104AbfJCQDT (ORCPT ); Thu, 3 Oct 2019 12:03:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 2CF0921A4C; Thu, 3 Oct 2019 16:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118598; bh=ZXx/rLq0nk9f0Ahs2K5n+bICEAILjbx/fuHqecPZgMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c5cH7AZLg1kpcrYe2iL5fpKo4dmr0Pfmso3bjZk0u9mpQnZxPjjljFp4KlqV6dvEF DWx0vr7P+u/lD52MVeMnX6WqY0s8zHinsj5WsesMGrU11t6+oANVrEJYozKD1AMVxY s7I2fHsoDBDu+7aG190UWCw0cxXlqhu2x8o92PD4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 068/129] media: dvb-core: fix a memory leak bug Date: Thu, 3 Oct 2019 17:53:11 +0200 Message-Id: <20191003154349.641487254@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wenwen Wang [ Upstream commit fcd5ce4b3936242e6679875a4d3c3acfc8743e15 ] In dvb_create_media_entity(), 'dvbdev->entity' is allocated through kzalloc(). Then, 'dvbdev->pads' is allocated through kcalloc(). However, if kcalloc() fails, the allocated 'dvbdev->entity' is not deallocated, leading to a memory leak bug. To fix this issue, free 'dvbdev->entity' before returning -ENOMEM. Signed-off-by: Wenwen Wang Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/dvb-core/dvbdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 75a3f4b57fd4f..a1cc1c1e53182 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -314,8 +314,10 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, if (npads) { dvbdev->pads = kcalloc(npads, sizeof(*dvbdev->pads), GFP_KERNEL); - if (!dvbdev->pads) + if (!dvbdev->pads) { + kfree(dvbdev->entity); return -ENOMEM; + } } switch (type) { -- 2.20.1